makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12355] Topic Tools not fully updated when subscribing/bookmarking
This commit is contained in:
Joas Schilling 2014-04-11 09:16:21 +02:00
commit 72bd6f227a
2 changed files with 41 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
phpBB/assets/javascript/core.js
View file

@ -549,14 +549,24 @@ phpbb.addAjaxCallback = function(id, callback) {
* current text so that the process can be repeated. * current text so that the process can be repeated.
*/ */
phpbb.addAjaxCallback('alt_text', function() { phpbb.addAjaxCallback('alt_text', function() {
var el = $(this), var el,
updateAll = $(this).data('update-all'),
altText; altText;
if (updateAll !== undefined && updateAll.length) {
el = $(updateAll);
} else {
el = $(this);
}
el.each(function() {
var el = $(this);
altText = el.attr('data-alt-text'); altText = el.attr('data-alt-text');
el.attr('data-alt-text', el.text()); el.attr('data-alt-text', el.text());
el.attr('title', altText); el.attr('title', $.trim(altText));
el.text(altText); el.text(altText);
}); });
});
/** /**
* This callback is based on the alt_text callback. * This callback is based on the alt_text callback.
@ -568,16 +578,25 @@ phpbb.addAjaxCallback('alt_text', function() {
* and changes the link itself. * and changes the link itself.
*/ */
phpbb.addAjaxCallback('toggle_link', function() { phpbb.addAjaxCallback('toggle_link', function() {
var el = $(this), var el,
updateAll = $(this).data('update-all') ,
toggleText, toggleText,
toggleUrl, toggleUrl,
toggleClass; toggleClass;
// Toggle link text if (updateAll !== undefined && updateAll.length) {
el = $(updateAll);
} else {
el = $(this);
}
el.each(function() {
var el = $(this);
// Toggle link text
toggleText = el.attr('data-toggle-text'); toggleText = el.attr('data-toggle-text');
el.attr('data-toggle-text', el.text()); el.attr('data-toggle-text', el.text());
el.attr('title', toggleText); el.attr('title', $.trim(toggleText));
el.text(toggleText); el.text(toggleText);
// Toggle link url // Toggle link url
@ -590,6 +609,7 @@ phpbb.addAjaxCallback('toggle_link', function() {
el.attr('data-toggle-class', el.parent().attr('class')); el.attr('data-toggle-class', el.parent().attr('class'));
el.parent().attr('class', toggleClass); el.parent().attr('class', toggleClass);
}); });
});
/** /**
* Automatically resize textarea * Automatically resize textarea

4
phpBB/styles/prosilver/template/viewtopic_topic_tools.html
View file

@ -7,14 +7,14 @@
<!-- EVENT viewtopic_topic_tools_before --> <!-- EVENT viewtopic_topic_tools_before -->
<!-- IF U_WATCH_TOPIC --> <!-- IF U_WATCH_TOPIC -->
<li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"> <li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->">
<a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}"> <a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link">
{S_WATCH_TOPIC_TITLE} {S_WATCH_TOPIC_TITLE}
</a> </a>
</li> </li>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF U_BOOKMARK_TOPIC --> <!-- IF U_BOOKMARK_TOPIC -->
<li class="small-icon icon-bookmark"> <li class="small-icon icon-bookmark">
<a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}"> <a href="{U_BOOKMARK_TOPIC}" class="bookmark-link" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}" data-update-all=".bookmark-link">
{S_BOOKMARK_TOPIC} {S_BOOKMARK_TOPIC}
</a> </a>
</li> </li>