From fac6963444fbaf1e776e35b1e283a080f1a24a43 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Tue, 6 Jan 2015 14:00:31 +0100 Subject: [PATCH 1/2] Add title to bb_observer tags to further clarify a bit what's going on --- include/bbcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index ab56bda61..030a1fb49 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -437,7 +437,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // replace [observer.baseurl] if ($observer) { - $s1 = ''; + $s1 = ''; $s2 = ''; $obsBaseURL = $observer['xchan_connurl']; $obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL); From 29e0bfee2f8e5a3e9a1d73f84c2c1f80b4637c3f Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Tue, 6 Jan 2015 15:54:58 +0100 Subject: [PATCH 2/2] Fix bug in readmore.js --- library/readmore.js/readmore.js | 7 ++++--- 1 file 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(); - }); + //}); }