summaryrefslogtreecommitdiffstats
path: root/readmore.js
diff options
context:
space:
mode:
authorJed Foster <jed@jedfoster.com>2015-01-03 20:04:09 -0800
committerJed Foster <jed@jedfoster.com>2015-01-03 20:05:48 -0800
commit472d72efcb82b460fc8a4cf8c1d3fcc4fb7efb39 (patch)
tree5aa7d80d6efdf2f02ab273d7bc6b1c899f936cd2 /readmore.js
parenta46db0eb23808273c9407b305aad55ef7554becd (diff)
downloadReadmore.js-472d72efcb82b460fc8a4cf8c1d3fcc4fb7efb39.zip
Readmore.js-472d72efcb82b460fc8a4cf8c1d3fcc4fb7efb39.tar.gz
Readmore.js-472d72efcb82b460fc8a4cf8c1d3fcc4fb7efb39.tar.bz2
Adjust height calculation and fix conditionalv2.0.1
Diffstat (limited to 'readmore.js')
-rw-r--r--readmore.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/readmore.js b/readmore.js
index 3a993de..8ef94eb 100644
--- a/readmore.js
+++ b/readmore.js
@@ -57,7 +57,7 @@
function uniqueId(prefix) {
var id = ++uniqueIdCounter;
- return String(prefix === null ? 'rmjs-' : prefix) + id;
+ return String(prefix == null ? 'rmjs-' : prefix) + id;
}
function setBoxHeights(element) {
@@ -67,7 +67,7 @@
maxHeight: 'none',
overflow: 'hidden'
}).insertAfter(element),
- expandedHeight = el.outerHeight(true),
+ expandedHeight = el.outerHeight(),
cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10),
defaultHeight = element.data('defaultHeight');