From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Mon, 6 Mar 2017 09:19:13 +0000 (+0300)
Subject: cdmClicked: do not use event.target.parents to figure out if clicked on a heading
X-Git-Tag: 17.4~16
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=63f0ed3d9c9cd73f9cc63f08e88b8cfbfe254793;p=tt-rss.git

cdmClicked: do not use event.target.parents to figure out if clicked on a heading
---

diff --git a/classes/feeds.php b/classes/feeds.php
index 5c7e8a18..014c5e36 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -666,7 +666,7 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "</div>";
 
 					$reply['content'] .= "<div class=\"cdmContent\" $content_hidden
-						onclick=\"return cdmClicked(event, $id);\"
+						onclick=\"return cdmClicked(event, $id, true);\"
 						id=\"CICD-$id\">";
 
 					$reply['content'] .= "<div id=\"POSTNOTE-$id\">";
diff --git a/js/viewfeed.js b/js/viewfeed.js
index abf56c18..7cbcc08b 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1479,7 +1479,7 @@ function show_labels_in_headlines(transport) {
 	}
 }
 
-function cdmClicked(event, id) {
+function cdmClicked(event, id, in_body) {
 	//var shift_key = event.shiftKey;
 
 	if (!event.ctrlKey && !event.metaKey) {
@@ -1521,7 +1521,7 @@ function cdmClicked(event, id) {
 			return !event.shiftKey;
 		}
 
-	} else if (event.target.parents(".cdmHeader").length > 0) {
+	} else if (!in_body) {
 
 		toggleSelected(id, true);
 
@@ -1535,6 +1535,8 @@ function cdmClicked(event, id) {
 		toggleUnread(id, 0, false);
 
 		openArticleInNewWindow(id);
+	} else {
+		return true;
 	}
 
 	var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length