harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #822 from pafcu/master

Browse Source 
Add title to bb_observer tags to further clarify a bit what's going on
This commit is contained in:
pafcu 2015-01-06 17:06:44 +02:00
commit 5c8aca9a61
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/bbcode.php
View File

@ -437,7 +437,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// replace [observer.baseurl] // replace [observer.baseurl]
if ($observer) { if ($observer) {
$s1 = '<span class="bb_observer">'; $s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">';
$s2 = '</span>'; $s2 = '</span>';
$obsBaseURL = $observer['xchan_connurl']; $obsBaseURL = $observer['xchan_connurl'];
$obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL); $obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL);

7
library/readmore.js/readmore.js
View File

@ -148,7 +148,6 @@
this.element = element; this.element = element;
this.options = $.extend({}, defaults, options); this.options = $.extend({}, defaults, options);
$(this.element).data({ $(this.element).data({
defaultHeight: this.options.collapsedHeight, defaultHeight: this.options.collapsedHeight,
heightMargin: this.options.heightMargin heightMargin: this.options.heightMargin
@ -159,9 +158,11 @@
this._defaults = defaults; this._defaults = defaults;
this._name = readmore; 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(); $this.init();
}); //});
} }