aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-15 14:08:35 -0800
committerfriendica <info@friendica.com>2015-01-15 14:08:35 -0800
commitf57a652e6be68ed7c7f307c9cde1f624635fa83a (patch)
tree3b147f4a28ce2cd926fe7b8714c8c9006aeabdaa
parent8d46cda021606104078e4e72104fb6c62daa8e29 (diff)
parentf9f23bd6c9b50e209f57e6cf8fde6846f214468f (diff)
downloadvolse-hubzilla-f57a652e6be68ed7c7f307c9cde1f624635fa83a.tar.gz
volse-hubzilla-f57a652e6be68ed7c7f307c9cde1f624635fa83a.tar.bz2
volse-hubzilla-f57a652e6be68ed7c7f307c9cde1f624635fa83a.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--library/readmore.js/readmore.js16
1 files changed, 2 insertions, 14 deletions
diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js
index 714e64fe7..e790ceb76 100644
--- a/library/readmore.js/readmore.js
+++ b/library/readmore.js/readmore.js
@@ -61,18 +61,12 @@
}
function setBoxHeights(element) {
- var el = element.clone().css({
- height: 'auto',
- width: element.width(),
- maxHeight: 'none',
- overflow: 'hidden'
- }).insertAfter(element),
+ var el = element,
expandedHeight = el.outerHeight(),
cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10),
defaultHeight = element.data('defaultHeight');
- el.remove();
-
+console.log("el height: " + expandedHeight);
var collapsedHeight = element.data('collapsedHeight') || defaultHeight;
if (!cssMaxHeight) {
@@ -206,10 +200,6 @@
}
}
});
-
- window.addEventListener('resize', function() {
- resizeBoxes();
- });
},
toggle: function(trigger, element, event) {
@@ -225,8 +215,6 @@
element = this.element;
}
- setBoxHeights($(element)); // Workaroud for problems with collapse
-
var $this = this,
$element = $(element),
newHeight = '',