Merge pull request #854 from pafcu/fixcollapse

Actually fix problem with post collapsing in webkit-based browsers
This commit is contained in:
pafcu 2015-01-15 23:17:06 +02:00
commit f9f23bd6c9

View File

@ -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 = '',