summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJed Foster <jed@jedfoster.com>2014-12-31 08:48:39 -0800
committerJed Foster <jed@jedfoster.com>2014-12-31 08:48:48 -0800
commit52f91deaada1c24bd5d74e6a89e53119cbc25ee0 (patch)
treeb52feb8b2749396cdb60f060cb1034c20cb707f6
parent9306da3078d8a0a919414b727133d9c6f2655f62 (diff)
downloadReadmore.js-52f91deaada1c24bd5d74e6a89e53119cbc25ee0.zip
Readmore.js-52f91deaada1c24bd5d74e6a89e53119cbc25ee0.tar.gz
Readmore.js-52f91deaada1c24bd5d74e6a89e53119cbc25ee0.tar.bz2
Embed transition CSS regardless of value of `embedCSS`
-rw-r--r--demo.html3
-rw-r--r--readmore.js27
2 files changed, 19 insertions, 11 deletions
diff --git a/demo.html b/demo.html
index 1a90f11..33aab7c 100644
--- a/demo.html
+++ b/demo.html
@@ -175,7 +175,8 @@
}
});
- $('article').readmore({maxHeight: 240});
+ $('article').readmore({maxHeight: 240, speed: 250});
</script>
</body>
</html>
+
diff --git a/readmore.js b/readmore.js
index 58630c8..ca6f9ca 100644
--- a/readmore.js
+++ b/readmore.js
@@ -36,15 +36,22 @@
delete(this.options.maxHeight);
- if(this.options.embedCSS && (! cssEmbedded[this.options.selector])) {
- var styles = ' ' + this.options.selector + ' + .readmore-js-toggle, ' + this.options.selector + '.readmore-js-section{' + this.options.sectionCSS + '}' +
- this.options.selector + '.readmore-js-section{' +
- 'transition: height ' + this.options.speed + 'ms;' +
- '-webkit-transform: translate3d(0,0,0);' +
- '-ms-transform: translate3d(0,0,0);' +
- 'transform: translate3d(0,0,0);' +
- 'overflow: hidden;' +
- '}';
+ if(! cssEmbedded[this.options.selector]) {
+ var styles = ' ';
+
+ // Include sectionCSS if embedCSS is true
+ if(this.options.embedCSS) {
+ styles += this.options.selector + ' + .readmore-js-toggle, ' + this.options.selector + '.readmore-js-section{' + this.options.sectionCSS + '}'
+ }
+
+ // Include the transition CSS even if embedCSS is false
+ styles += this.options.selector + '.readmore-js-section{' +
+ 'transition: height ' + this.options.speed + 'ms;' +
+ '-webkit-transform: translate3d(0,0,0);' +
+ '-ms-transform: translate3d(0,0,0);' +
+ 'transform: translate3d(0,0,0);' +
+ 'overflow: hidden;' +
+ '}';
(function(d,u) {
var css=d.createElement('style');
@@ -53,7 +60,7 @@
css.styleSheet.cssText = u;
}
else {
- css.appendChild(d.createTextNode(u));
+ css.appendChild(d.createTextNode(u));
}
d.getElementsByTagName('head')[0].appendChild(css);
}(document, styles));