Permalink
Browse files

Merge remote-tracking branch 'marc1706/ticket/10784' into develop

* marc1706/ticket/10784:
  [ticket/10784] Do not show ajax overlay unless needed
  • Loading branch information...
2 parents 3ece096 + 7a9d9f9 commit 1828d74502c800acd9eb8b87438e628f59b10dad @igorw igorw committed Apr 12, 2012
Showing with 13 additions and 5 deletions.
  1. +8 −4 phpBB/adm/style/ajax.js
  2. +5 −1 phpBB/assets/javascript/core.js
View
@@ -28,7 +28,8 @@ phpbb.add_ajax_callback('forum_down', function() {
phpbb.ajaxify({
selector: el.parents('span').siblings('.up').children('a'),
- callback: 'forum_up'
+ callback: 'forum_up',
+ overlay: false
});
}
@@ -43,7 +44,8 @@ phpbb.add_ajax_callback('forum_down', function() {
phpbb.ajaxify({
selector: tr.prev().find('.down').children('a'),
- callback: 'forum_down'
+ callback: 'forum_down',
+ overlay: false
});
}
});
@@ -61,7 +63,8 @@ phpbb.add_ajax_callback('forum_up', function() {
phpbb.ajaxify({
selector: el.parents('span').siblings('.down').children('a'),
- callback: 'forum_down'
+ callback: 'forum_down',
+ overlay: false
});
}
@@ -76,7 +79,8 @@ phpbb.add_ajax_callback('forum_up', function() {
phpbb.ajaxify({
selector: tr.next().find('.up').children('a'),
- callback: 'forum_up'
+ callback: 'forum_up',
+ overlay: false
});
}
});
@@ -245,6 +245,7 @@ phpbb.ajaxify = function(options) {
var elements = $(options.selector),
refresh = options.refresh,
callback = options.callback,
+ overlay = (typeof options.overlay !== 'undefined') ? options.overlay : true,
is_form = elements.is('form'),
event_name = is_form ? 'submit' : 'click';
@@ -382,7 +383,10 @@ phpbb.ajaxify = function(options) {
return;
}
- phpbb.loading_alert();
+ if (overlay)
+ {
+ phpbb.loading_alert();
+ }
$.ajax({
url: action,

0 comments on commit 1828d74

Please sign in to comment.