diff options
| author | pafcu <pafcu@iki.fi> | 2015-01-06 17:06:44 +0200 |
|---|---|---|
| committer | pafcu <pafcu@iki.fi> | 2015-01-06 17:06:44 +0200 |
| commit | 5c8aca9a611c5c98aa2eda2bbc3c5cef686f5ce2 (patch) | |
| tree | 2c79c93e3045e9d1daa587eac7a7d9a4eae2ef54 | |
| parent | 3185bfe3ca131d471b8fcdc0c94abf1a114486c7 (diff) | |
| parent | 29e0bfee2f8e5a3e9a1d73f84c2c1f80b4637c3f (diff) | |
| download | volse-hubzilla-5c8aca9a611c5c98aa2eda2bbc3c5cef686f5ce2.tar.gz volse-hubzilla-5c8aca9a611c5c98aa2eda2bbc3c5cef686f5ce2.tar.bz2 volse-hubzilla-5c8aca9a611c5c98aa2eda2bbc3c5cef686f5ce2.zip | |
Merge pull request #822 from pafcu/master
Add title to bb_observer tags to further clarify a bit what's going on
| -rw-r--r-- | include/bbcode.php | 2 | ||||
| -rw-r--r-- | library/readmore.js/readmore.js | 7 |
2 files changed, 5 insertions, 4 deletions
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 = '<span class="bb_observer">'; + $s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">'; $s2 = '</span>'; $obsBaseURL = $observer['xchan_connurl']; $obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL); 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(); - }); + //}); } |