From 38e46fff548729ba459d0a83a46fbfa0d844e85d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 22 Jul 2016 14:03:14 +0200
Subject: upgrade readmore.js and improve collapsing a little

---
 view/js/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/js/main.js')

diff --git a/view/js/main.js b/view/js/main.js
index a288f98f5..a3fade0ea 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -659,7 +659,7 @@ function collapseHeight() {
 	var position = $(window).scrollTop();
 
 	$(".wall-item-content, .directory-collapse").each(function() {
-		var orgHeight = parseInt($(this).css('height'));
+		var orgHeight = $(this).outerHeight(true);
 		if(orgHeight > divmore_height) {
 			if(! $(this).hasClass('divmore')) {
 
@@ -679,7 +679,7 @@ function collapseHeight() {
 					beforeToggle: function(trigger, element, expanded) {
 						if(expanded) {
 							if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) {
-								$(window).scrollTop($(window).scrollTop() - (orgHeight - divmore_height));
+								$(window).scrollTop($(window).scrollTop() - ($(element).outerHeight(true) - divmore_height));
 							}
 						}
 					}
-- 
cgit v1.2.3