remove expandable CDM headlines

[tt-rss.git] / plugins / shorten_expanded / init.js

diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index 11ecbc5d5dea17b8af8326ff9d15d9cee581700b..a744aad005f27b7c443187752e3328b06b6eab27 100644 (file)
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -2,13 +2,13 @@ var _shorten_expanded_threshold = 1.5; //window heights
 
 function expandSizeWrapper(id) {
        try {
-               var row = $(id);
+               const row = $(id);
 
                console.log(row);
 
                if (row) {
-                       var content = row.select(".contentSizeWrapper")[0];
-                       var link = row.select(".expandPrompt")[0];
+                       const content = row.select(".contentSizeWrapper")[0];
+                       const link = row.select(".expandPrompt")[0];
 
                        if (content) content.removeClassName("contentSizeWrapper");
                        if (link) Element.hide(link);
@@ -22,26 +22,31 @@ function expandSizeWrapper(id) {
 
 }
 
-dojo.addOnLoad(function() {
-       PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
-               if (getInitParam('cdm_expanded')) {
+require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 
+       ready(function() {
+               PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
                        window.setTimeout(function() {
                                if (row) {
-                                       if (row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
-                                               var content = row.select(".cdmContentInner")[0];
+                                       const c_inner = row.select(".cdmContentInner")[0];
+                                       const c_inter = row.select(".cdmIntermediate")[0];
 
-                                               if (content) {
-                                                       var wrapperHeight = Math.round(window.innerHeight * 0.8) + 'px';
+                                       if (c_inner && c_inter &&
+                                               row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
 
-                                                       content.innerHTML = "<div class='contentSizeWrapper' style='height : "+wrapperHeight+"'>" +
-                                                               content.innerHTML + "</div><button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' "+
-                                                               "href='#'>" + __("Click to expand article") + "</button>";
+                                               c_inter.parentNode.removeChild(c_inter);
 
-                                               }
+                                               c_inner.innerHTML = "<div class='contentSizeWrapper'>" +
+                                                       c_inner.innerHTML +
+                                                       c_inter.innerHTML + "</div>" +
+                                                       "<button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' href='#'>" +
+                                                               __("Click to expand article") + "</button>";
                                        }
                                }
                        }, 150);
-               }
+
+                       return true;
+               });
        });
+
 });