From 82adb01307e108e8a2b4eeb900552160d730d0b7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 14:10:46 +0300
Subject: render enclosures on the client

---
 plugins/shorten_expanded/init.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'plugins/shorten_expanded/init.js')

diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index 30bfac6ba..181e426a4 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -1,3 +1,5 @@
+/* global Plugins, __, require, PluginHost */
+
 const _shorten_expanded_threshold = 1.5; //window heights
 
 Plugins.Shorten_Expanded = {
@@ -22,26 +24,23 @@ require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 			window.setTimeout(function() {
 				if (row) {
 
-					const c_inner = row.select(".content-inner")[0];
-					const c_inter = row.select(".intermediate")[0];
+					const content = row.querySelector(".content-inner");
+					const attachments = row.querySelector(".attachments-inline");
 
-					if (c_inner && c_inter &&
+					if (content && attachments &&
 						row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
 
-						let tmp = document.createElement("div");
-
-						c_inter.select("> *:not([class*='attachments'])").each(function(p) {
-							p.parentNode.removeChild(p);
-							tmp.appendChild(p);
-						});
-
-						c_inner.innerHTML = `<div class="content-shrink-wrap">
-							${c_inner.innerHTML}
-							${tmp.innerHTML}</div>
+						content.innerHTML = `
+							<div class="content-shrink-wrap">
+								${content.innerHTML}
+								${attachments.innerHTML}
+							</div>
 							<button dojoType="dijit.form.Button" class="alt-info expand-prompt" onclick="return Plugins.Shorten_Expanded.expand('${row.id}')" href="#">
 								${__("Click to expand article")}</button>`;
 
-						dojo.parser.parse(c_inner);
+						attachments.innerHTML = "";
+
+						dojo.parser.parse(content);
 					}
 				}
 			}, 150);
-- 
cgit v1.2.3


From 6e06fe2885f2250d446d613215dbadf63d08a766 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 08:31:24 +0300
Subject: shorten_expanded: fix for posts without attachments

---
 plugins/shorten_expanded/init.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'plugins/shorten_expanded/init.js')

diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index 181e426a4..873749c03 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -25,20 +25,23 @@ require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 				if (row) {
 
 					const content = row.querySelector(".content-inner");
-					const attachments = row.querySelector(".attachments-inline");
 
-					if (content && attachments &&
-						row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
+					//console.log('shorten', row.offsetHeight, 'vs', _shorten_expanded_threshold * window.innerHeight);
+
+					if (content && row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
+
+						const attachments = row.querySelector(".attachments-inline"); // optional
 
 						content.innerHTML = `
 							<div class="content-shrink-wrap">
 								${content.innerHTML}
-								${attachments.innerHTML}
+								${attachments ? attachments.innerHTML : ''}
 							</div>
 							<button dojoType="dijit.form.Button" class="alt-info expand-prompt" onclick="return Plugins.Shorten_Expanded.expand('${row.id}')" href="#">
 								${__("Click to expand article")}</button>`;
 
-						attachments.innerHTML = "";
+						if (attachments)
+							attachments.innerHTML = "";
 
 						dojo.parser.parse(content);
 					}
-- 
cgit v1.2.3


From 70fa4230268a422d0b7eef1ea223ca5cc1c14646 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 18 Feb 2021 21:51:18 +0300
Subject: initial for RIP prototype/scriptaculous

---
 plugins/shorten_expanded/init.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/shorten_expanded/init.js')

diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index 873749c03..0abc8c129 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -7,8 +7,8 @@ Plugins.Shorten_Expanded = {
 		const row = $(id);
 
 		if (row) {
-			const content = row.select(".content-shrink-wrap")[0];
-			const link = row.select(".expand-prompt")[0];
+			const content = row.querySelector(".content-shrink-wrap");
+			const link = row.querySelector(".expand-prompt");
 
 			if (content) content.removeClassName("content-shrink-wrap");
 			if (link) Element.hide(link);
-- 
cgit v1.2.3