From 67dd80f84250f7e8b1b39693f5fef2ff27ffb85a Mon Sep 17 00:00:00 2001 From: Paulius Šukys Date: Mon, 22 May 2017 09:33:55 +0200 Subject: Added additional configuration setting for #1530 . This includes default settings and translation entry for English --- p/scripts/main.js | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'p/scripts') diff --git a/p/scripts/main.js b/p/scripts/main.js index 5dbb95c91..397b04022 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -705,6 +705,13 @@ function init_stream(divStream) { if ($(e.target).closest('.content, .item.website, .item.link').length > 0) { return; } + + // setting for not-closing after clicking outside article area + if (context.sides_close_article && + e.target.tagName.toUpperCase() === 'DIV' && + $.inArray("flux_content", e.target.attributes)) { + return; + } var old_active = $(".flux.current"), new_active = $(this).parent(); isCollapsed = true; @@ -714,6 +721,7 @@ function init_stream(divStream) { } return true; } + toggleContent(new_active, old_active); }); -- cgit v1.2.3 From 5208872481f570ca3381846edbf21b3c163b1b9e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Fri, 26 May 2017 13:08:00 +0200 Subject: sides_close_article: JS syntax --- p/scripts/main.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'p/scripts') diff --git a/p/scripts/main.js b/p/scripts/main.js index 11b06fec0..f01af20ff 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -705,11 +705,8 @@ function init_stream(divStream) { if ($(e.target).closest('.content, .item.website, .item.link').length > 0) { return; } - - // setting for not-closing after clicking outside article area - if (context.sides_close_article && - e.target.tagName.toUpperCase() === 'DIV' && - $.inArray("flux_content", e.target.attributes)) { + if (!context.sides_close_article && $(e.target).is('div.flux_content')) { + // setting for not-closing after clicking outside article area return; } var old_active = $(".flux.current"), @@ -721,7 +718,6 @@ function init_stream(divStream) { } return true; } - toggleContent(new_active, old_active); }); -- cgit v1.2.3