diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-10-10 14:27:49 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-10-10 14:28:52 +0200 |
| commit | 78c63c480a4dcad8ec83321cdad13e72c7158706 (patch) | |
| tree | dd92d6b2cd5d7577bc5030836da1284cf746f213 /library/readmore.js | |
| parent | b2cc2e6765a9044a20c507860608c16ab8e30442 (diff) | |
| download | volse-hubzilla-78c63c480a4dcad8ec83321cdad13e72c7158706.tar.gz volse-hubzilla-78c63c480a4dcad8ec83321cdad13e72c7158706.tar.bz2 volse-hubzilla-78c63c480a4dcad8ec83321cdad13e72c7158706.zip | |
another fix to readmore.js and update patch file
Diffstat (limited to 'library/readmore.js')
| -rw-r--r-- | library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch | 20 | ||||
| -rw-r--r-- | library/readmore.js/readmore.js | 4 |
2 files changed, 21 insertions, 3 deletions
diff --git a/library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch b/library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch index fd3146152..e947d8854 100644 --- a/library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch +++ b/library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch @@ -2,12 +2,30 @@ diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index 34a624e..51222ce 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js +@@ -79,7 +79,7 @@ + maxHeight: 'none', + overflow: 'hidden' + }).insertAfter(element), +- expandedHeight = el.outerHeight(), ++ expandedHeight = 100 + '%', + cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10), + defaultHeight = element.data('defaultHeight'); + +@@ -102,7 +102,7 @@ + var resizeBoxes = debounce(function() { + $('[data-readmore]').each(function() { + var current = $(this), +- isExpanded = (current.attr('aria-expanded') === 'true'); ++ isExpanded = (current.height() > current.data('collapsedHeight')); + + setBoxHeights(current); + @@ -246,7 +246,7 @@ collapsedHeight = $element.data('collapsedHeight'); if ($element.height() <= collapsedHeight) { - newHeight = $element.data('expandedHeight') + 'px'; -+ newHeight = 100 + '%'; ++ newHeight = $element.data('expandedHeight'); newLink = 'lessLink'; expanded = true; } diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index 8b215dcb4..4c4252e54 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js @@ -79,7 +79,7 @@ maxHeight: 'none', overflow: 'hidden' }).insertAfter(element), - expandedHeight = el.outerHeight(), + expandedHeight = 100 + '%', cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10), defaultHeight = element.data('defaultHeight'); @@ -246,7 +246,7 @@ collapsedHeight = $element.data('collapsedHeight'); if ($element.height() <= collapsedHeight) { - newHeight = 100 + '%'; + newHeight = $element.data('expandedHeight'); newLink = 'lessLink'; expanded = true; } |