From 0cf910991ef688a4bca76a056d44f11c828478d1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 7 Jul 2015 16:43:22 +0300
Subject: shorten_expanded: shorten based on window height not preset value

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

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

diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index ba82b643b..11ecbc5d5 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -1,4 +1,4 @@
-var _shorten_expanded_threshold = 900; //px, longer than css height so that we would only clip articles significantly longer than limit
+var _shorten_expanded_threshold = 1.5; //window heights
 
 function expandSizeWrapper(id) {
 	try {
@@ -28,11 +28,13 @@ dojo.addOnLoad(function() {
 
 			window.setTimeout(function() {
 				if (row) {
-					if (row.offsetHeight >= _shorten_expanded_threshold) {
+					if (row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
 						var content = row.select(".cdmContentInner")[0];
 
 						if (content) {
-							content.innerHTML = "<div class='contentSizeWrapper'>" +
+							var wrapperHeight = Math.round(window.innerHeight * 0.8) + 'px';
+
+							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>";
 
-- 
cgit v1.2.3


From 3cea4a4b758768770366d132393a026ee2d8a430 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 7 Jul 2015 16:52:43 +0300
Subject: go back to fixed wrapper height because dynamic one breaks layout in
 chrome :(

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

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

diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index 11ecbc5d5..4d80f8407 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -32,9 +32,7 @@ dojo.addOnLoad(function() {
 						var content = row.select(".cdmContentInner")[0];
 
 						if (content) {
-							var wrapperHeight = Math.round(window.innerHeight * 0.8) + 'px';
-
-							content.innerHTML = "<div class='contentSizeWrapper' style='height : "+wrapperHeight+"'>" +
+							content.innerHTML = "<div class='contentSizeWrapper'>" +
 								content.innerHTML + "</div><button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' "+
 								"href='#'>" + __("Click to expand article") + "</button>";
 
-- 
cgit v1.2.3