af_readability: allow get full text button to work as a toggle; in cdm, scroll to article after embedding

2 files changed, 20 insertions, 4 deletions

diff --git a/plugins/af_readability/init.js b/plugins/af_readability/init.js
index fd603cbf1..644dff9fe 100644
--- a/plugins/af_readability/init.js
+++ b/plugins/af_readability/init.js
@@ -1,16 +1,32 @@
 Plugins.Af_Readability = {
+    orig_attr_name: 'data-readability-orig-content',
+    self: this,
     embed: function(id) {
+        const content = $$(App.isCombinedMode() ? ".cdm[data-article-id=" + id + "] .content-inner" :
+            ".post[data-article-id=" + id + "] .content")[0];
+
+        if (content.hasAttribute(self.orig_attr_name)) {
+            content.innerHTML = content.getAttribute(self.orig_attr_name);
+            content.removeAttribute(self.orig_attr_name);
+
+            if (App.isCombinedMode()) Article.cdmScrollToId(id);
+
+            return;
+        }
+
         Notify.progress("Loading, please wait...");
 
         xhrJson("backend.php",{ op: "pluginhandler", plugin: "af_readability", method: "embed", param: id }, (reply) => {
-            const content = $$(App.isCombinedMode() ? ".cdm[data-article-id=" + id + "] .content-inner" :
-                ".post[data-article-id=" + id + "] .content")[0];
 
             if (content && reply.content) {
+                content.setAttribute(self.orig_attr_name, content.innerHTML);
                 content.innerHTML = reply.content;
                 Notify.close();
+
+                if (App.isCombinedMode()) Article.cdmScrollToId(id);
+
             } else {
-                Notify.error("Unable to fetch content for this article");
+                Notify.error("Unable to fetch full text for this article");
             }
         });
     }
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index ef7809d3f..9c62a4772 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -53,7 +53,7 @@ class Af_Readability extends Plugin {
 
 	function hook_article_button($line) {
 		return "<i class='material-icons' onclick=\"Plugins.Af_Readability.embed(".$line["id"].")\"
-			style='cursor : pointer' title='".__('Get full article text')."'>description</i>";
+			style='cursor : pointer' title='".__('Toggle full article text')."'>description</i>";
 	}
 
 	function hook_prefs_tab($args) {