diff options
author | Jed Foster <jed@jedfoster.com> | 2014-12-31 07:42:12 -0800 |
---|---|---|
committer | Jed Foster <jed@jedfoster.com> | 2014-12-31 07:42:12 -0800 |
commit | 24d2f57c978d83edd2c5215ef1a19bcff9f5fc8c (patch) | |
tree | 01a5f0c9573738cfd8a9d642056155490574576d /readmore.js | |
parent | d8d5cdef39d9592fc6a8ae807a972a685ef6ffd1 (diff) | |
parent | d28bfd6eee6137a8905925157e2805e085138367 (diff) | |
download | Readmore.js-24d2f57c978d83edd2c5215ef1a19bcff9f5fc8c.zip Readmore.js-24d2f57c978d83edd2c5215ef1a19bcff9f5fc8c.tar.gz Readmore.js-24d2f57c978d83edd2c5215ef1a19bcff9f5fc8c.tar.bz2 |
Merge pull request #74 from chriskief/master
Fix for https://github.com/jedfoster/Readmore.js/issues/73
Diffstat (limited to 'readmore.js')
-rw-r--r-- | readmore.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/readmore.js b/readmore.js index 82ed259..1229fb4 100644 --- a/readmore.js +++ b/readmore.js @@ -67,7 +67,7 @@ $(this.element).each(function() { var current = $(this), - maxHeight = (current.css('max-height').replace(/[^-\d\.]/g, '') > current.data('max-height')) ? current.css('max-height').replace(/[^-\d\.]/g, '') : current.data('max-height'), + maxHeight = (parseInt(current.css('max-height').replace(/[^-\d\.]/g, ''), 10) > current.data('max-height')) ? parseInt(current.css('max-height').replace(/[^-\d\.]/g, ''), 10) : current.data('max-height'), heightMargin = current.data('height-margin'); if(current.css('max-height') != 'none') { |