diff options
author | friendica <info@friendica.com> | 2015-01-06 11:26:54 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-01-06 11:26:54 -0800 |
commit | e20d82ab0b839ac4a93d91f5aeaec562b7fecd18 (patch) | |
tree | 602e5babdc37a1020bff39b2c996e660bd19926b /library | |
parent | 859b672e37d41ed251070c5262f27c1099241b79 (diff) | |
parent | b8d3936e473011298bf58d28db5c95c489f5836f (diff) | |
download | volse-hubzilla-e20d82ab0b839ac4a93d91f5aeaec562b7fecd18.tar.gz volse-hubzilla-e20d82ab0b839ac4a93d91f5aeaec562b7fecd18.tar.bz2 volse-hubzilla-e20d82ab0b839ac4a93d91f5aeaec562b7fecd18.zip |
Merge branch 'master' into trinidad
Diffstat (limited to 'library')
-rw-r--r-- | library/readmore.js/readmore.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index 81cfb3cea..171f69776 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js @@ -148,7 +148,6 @@ this.element = element; this.options = $.extend({}, defaults, options); - $(this.element).data({ defaultHeight: this.options.collapsedHeight, heightMargin: this.options.heightMargin @@ -159,9 +158,11 @@ this._defaults = defaults; this._name = readmore; - window.addEventListener('load', function() { + // Waiting for the page to load doesn't work when there is dynamic content + // But usually we already have the content, so no need to wait + //window.addEventListener('load', function() { $this.init(); - }); + //}); } |