From 2dac797704dcdc0293a7989c56cbb86be7a7dfde Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 5 Dec 2018 16:26:53 +0300
Subject: floatingTitle-related fixes

---
 js/Article.js   | 1 -
 js/Headlines.js | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'js')

diff --git a/js/Article.js b/js/Article.js
index f2c4007f5..507560ee4 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -233,7 +233,6 @@ define(["dojo/_base/declare"], function (declare) {
 			if (force || e.offsetTop + e.offsetHeight > (ctr.scrollTop + ctr.offsetHeight) ||
 				e.offsetTop < ctr.scrollTop) {
 
-				// expanded cdm has a 4px margin now
 				ctr.scrollTop = e.offsetTop;
 
 				Element.hide("floatingTitle");
diff --git a/js/Headlines.js b/js/Headlines.js
index 9da7f7149..3a9f323bb 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -173,15 +173,11 @@ define(["dojo/_base/declare"], function (declare) {
 
 							ft.setAttribute("data-article-id", id);
 							ft.innerHTML = header.innerHTML;
-							ft.firstChild.innerHTML = "<img class='anchor marked-pic' src='images/page_white_go.png' " +
-								"onclick=\"Article.cdmScrollToId(" + id + ", true)\">" + ft.firstChild.innerHTML;
 
-							this.initFloatingMenu();
+							ft.select(".dijitCheckBox")[0].outerHTML = "<i class=\"material-icons anchor\" onclick=\"Article.cdmScrollToId(" + id + ", true)\">expand_more</i>";
 
-							const cb = ft.select(".rchk")[0];
+							this.initFloatingMenu();
 
-							if (cb)
-								cb.parentNode.removeChild(cb);
 						}
 
 						if (row.hasClassName("Unread"))
@@ -1005,6 +1001,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 				const menu = new dijit.Menu({
 					id: "floatingMenu",
+					selector: ".hlMenuAttach",
 					targetNodeIds: ["floatingTitle"]
 				});
 
-- 
cgit v1.2.3