diff options
| author | Jed Foster <jed@jedfoster.com> | 2015-02-01 18:27:16 -0800 |
|---|---|---|
| committer | Jed Foster <jed@jedfoster.com> | 2015-02-01 18:29:16 -0800 |
| commit | 0714d62b35d93cc9f9e8e8db4871a0c5192a40c0 (patch) | |
| tree | 227cb38ca2165ddffa75dcabb48633c9fd498683 /readmore.js | |
| parent | ee4e0f70065f79f45952e8b3d6389a09542314fb (diff) | |
| download | Readmore.js-0714d62b35d93cc9f9e8e8db4871a0c5192a40c0.zip Readmore.js-0714d62b35d93cc9f9e8e8db4871a0c5192a40c0.tar.gz Readmore.js-0714d62b35d93cc9f9e8e8db4871a0c5192a40c0.tar.bz2 | |
Fix collapsedHeight logicv2.0.4
Fixes #77. Wasn't properly using `max-height` set in CSS.
Diffstat (limited to 'readmore.js')
| -rw-r--r-- | readmore.js | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/readmore.js b/readmore.js index 19d05b7..5430648 100644 --- a/readmore.js +++ b/readmore.js @@ -73,14 +73,7 @@ el.remove(); - var collapsedHeight = element.data('collapsedHeight') || defaultHeight; - - if (! cssMaxHeight) { - collapsedHeight = defaultHeight; - } - else if (cssMaxHeight > collapsedHeight) { - collapsedHeight = cssMaxHeight; - } + var collapsedHeight = cssMaxHeight || element.data('collapsedHeight') || defaultHeight; // Store our measurements. element.data({ |