summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-10 18:15:52 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-10 18:15:52 +0100
commit1debeecb3e69a6d36492c16b8dd9b5d0eb4a4d3b (patch)
tree4074761ff67239577afe22711e1c4402bae85b23
parent700a154cb8cfc96ff35e39142078492eb602b082 (diff)
Clic titre d'un flux d'un article
Corrige https://github.com/marienfressinaud/FreshRSS/issues/360
-rw-r--r--p/scripts/main.js13
1 files changed, 7 insertions, 6 deletions
diff --git a/p/scripts/main.js b/p/scripts/main.js
index de71ada94..24af1b210 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -405,6 +405,9 @@ function init_shortcuts() {
function init_stream_delegates(divStream) {
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"),
new_active = $(this).parent();
isCollapsed = true;
@@ -420,21 +423,15 @@ function init_stream_delegates(divStream) {
divStream.on('click', '.flux a.read', function () {
var active = $(this).parents(".flux");
mark_read(active, false);
-
return false;
});
divStream.on('click', '.flux a.bookmark', function () {
var active = $(this).parents(".flux");
mark_favorite(active);
-
return false;
});
- divStream.on('click', '.flux .content a', function () {
- $(this).attr('target', '_blank');
- });
-
divStream.on('click', '.item.title>a', function (e) {
if (e.ctrlKey) {
return true; //Allow default control-click behaviour such as open in backround-tab
@@ -443,6 +440,10 @@ function init_stream_delegates(divStream) {
return false;
});
+ divStream.on('click', '.flux .content a', function () {
+ $(this).attr('target', '_blank');
+ });
+
if (auto_mark_site) {
divStream.on('click', '.flux .link a', function () {
mark_read($(this).parent().parent().parent(), true);