|
@@ -405,6 +405,9 @@ function init_shortcuts() {
|
|
|
|
|
|
|
|
function init_stream_delegates(divStream) {
|
|
function init_stream_delegates(divStream) {
|
|
|
divStream.on('click', '.flux_header', function (e) { //flux_header_toggle
|
|
divStream.on('click', '.flux_header', function (e) { //flux_header_toggle
|
|
|
|
|
+ if ($(e.target).closest('.item.website > a').length > 0) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
var old_active = $(".flux.current"),
|
|
var old_active = $(".flux.current"),
|
|
|
new_active = $(this).parent();
|
|
new_active = $(this).parent();
|
|
|
isCollapsed = true;
|
|
isCollapsed = true;
|
|
@@ -420,21 +423,15 @@ function init_stream_delegates(divStream) {
|
|
|
divStream.on('click', '.flux a.read', function () {
|
|
divStream.on('click', '.flux a.read', function () {
|
|
|
var active = $(this).parents(".flux");
|
|
var active = $(this).parents(".flux");
|
|
|
mark_read(active, false);
|
|
mark_read(active, false);
|
|
|
-
|
|
|
|
|
return false;
|
|
return false;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
divStream.on('click', '.flux a.bookmark', function () {
|
|
divStream.on('click', '.flux a.bookmark', function () {
|
|
|
var active = $(this).parents(".flux");
|
|
var active = $(this).parents(".flux");
|
|
|
mark_favorite(active);
|
|
mark_favorite(active);
|
|
|
-
|
|
|
|
|
return false;
|
|
return false;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- divStream.on('click', '.flux .content a', function () {
|
|
|
|
|
- $(this).attr('target', '_blank');
|
|
|
|
|
- });
|
|
|
|
|
-
|
|
|
|
|
divStream.on('click', '.item.title>a', function (e) {
|
|
divStream.on('click', '.item.title>a', function (e) {
|
|
|
if (e.ctrlKey) {
|
|
if (e.ctrlKey) {
|
|
|
return true; //Allow default control-click behaviour such as open in backround-tab
|
|
return true; //Allow default control-click behaviour such as open in backround-tab
|
|
@@ -443,6 +440,10 @@ function init_stream_delegates(divStream) {
|
|
|
return false;
|
|
return false;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
+ divStream.on('click', '.flux .content a', function () {
|
|
|
|
|
+ $(this).attr('target', '_blank');
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
if (auto_mark_site) {
|
|
if (auto_mark_site) {
|
|
|
divStream.on('click', '.flux .link a', function () {
|
|
divStream.on('click', '.flux .link a', function () {
|
|
|
mark_read($(this).parent().parent().parent(), true);
|
|
mark_read($(this).parent().parent().parent(), true);
|