diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-11 09:13:45 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-11 09:13:45 +0200 |
| commit | 6664dbb5863fe7fe730437fc44a53a817acaf1c0 (patch) | |
| tree | 4aaaaff372757ba8d6274a4e4a3502c8288d5705 /phpBB/assets/javascript/core.js | |
| parent | 251b2ba28f2be2f9a889b931f5736279ce378e91 (diff) | |
| parent | 285b7a1f4c8dc3685efb04818747465e91be22c9 (diff) | |
| download | forums-6664dbb5863fe7fe730437fc44a53a817acaf1c0.tar forums-6664dbb5863fe7fe730437fc44a53a817acaf1c0.tar.gz forums-6664dbb5863fe7fe730437fc44a53a817acaf1c0.tar.bz2 forums-6664dbb5863fe7fe730437fc44a53a817acaf1c0.tar.xz forums-6664dbb5863fe7fe730437fc44a53a817acaf1c0.zip | |
Merge remote-tracking branch 'varunagw/ticket/12355' into develop-ascraeus
* varunagw/ticket/12355:
[ticket/12355] Topic Tools not fully updated when subscribing/bookmarking
Diffstat (limited to 'phpBB/assets/javascript/core.js')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 58 |
1 files changed, 39 insertions, 19 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index aa9dc9af82..ca62a5f649 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -549,13 +549,23 @@ phpbb.addAjaxCallback = function(id, callback) { * current text so that the process can be repeated. */ phpbb.addAjaxCallback('alt_text', function() { - var el = $(this), + var el, + updateAll = $(this).data('update-all'), altText; - altText = el.attr('data-alt-text'); - el.attr('data-alt-text', el.text()); - el.attr('title', altText); - el.text(altText); + if (updateAll !== undefined && updateAll.length) { + el = $(updateAll); + } else { + el = $(this); + } + + el.each(function() { + var el = $(this); + altText = el.attr('data-alt-text'); + el.attr('data-alt-text', el.text()); + el.attr('title', $.trim(altText)); + el.text(altText); + }); }); /** @@ -568,27 +578,37 @@ phpbb.addAjaxCallback('alt_text', function() { * and changes the link itself. */ phpbb.addAjaxCallback('toggle_link', function() { - var el = $(this), + var el, + updateAll = $(this).data('update-all') , toggleText, toggleUrl, toggleClass; - // Toggle link text + if (updateAll !== undefined && updateAll.length) { + el = $(updateAll); + } else { + el = $(this); + } - toggleText = el.attr('data-toggle-text'); - el.attr('data-toggle-text', el.text()); - el.attr('title', toggleText); - el.text(toggleText); + el.each(function() { + var el = $(this); - // Toggle link url - toggleUrl = el.attr('data-toggle-url'); - el.attr('data-toggle-url', el.attr('href')); - el.attr('href', toggleUrl); + // Toggle link text + toggleText = el.attr('data-toggle-text'); + el.attr('data-toggle-text', el.text()); + el.attr('title', $.trim(toggleText)); + el.text(toggleText); - // Toggle class of link parent - toggleClass = el.attr('data-toggle-class'); - el.attr('data-toggle-class', el.parent().attr('class')); - el.parent().attr('class', toggleClass); + // Toggle link url + toggleUrl = el.attr('data-toggle-url'); + el.attr('data-toggle-url', el.attr('href')); + el.attr('href', toggleUrl); + + // Toggle class of link parent + toggleClass = el.attr('data-toggle-class'); + el.attr('data-toggle-class', el.parent().attr('class')); + el.parent().attr('class', toggleClass); + }); }); /** |