makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10784] Do not show ajax overlay unless needed

Browse source 
PHPBB3-10784
This commit is contained in:
Marc Alexander 2012-04-11 23:29:47 +02:00
parent fd55c8664a
commit 7a9d9f97ef
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/adm/style/ajax.js
View file

@ -28,7 +28,8 @@ phpbb.add_ajax_callback('forum_down', function() {
phpbb.ajaxify({ phpbb.ajaxify({
selector: el.parents('span').siblings('.up').children('a'), 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({ phpbb.ajaxify({
selector: tr.prev().find('.down').children('a'), 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({ phpbb.ajaxify({
selector: el.parents('span').siblings('.down').children('a'), 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({ phpbb.ajaxify({
selector: tr.next().find('.up').children('a'), selector: tr.next().find('.up').children('a'),
callback: 'forum_up' callback: 'forum_up',
overlay: false
}); });
} }
}); });

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

@ -245,6 +245,7 @@ phpbb.ajaxify = function(options) {
var elements = $(options.selector), var elements = $(options.selector),
refresh = options.refresh, refresh = options.refresh,
callback = options.callback, callback = options.callback,
overlay = (typeof options.overlay !== 'undefined') ? options.overlay : true,
is_form = elements.is('form'), is_form = elements.is('form'),
event_name = is_form ? 'submit' : 'click'; event_name = is_form ? 'submit' : 'click';
@ -382,7 +383,10 @@ phpbb.ajaxify = function(options) {
return; return;
} }
phpbb.loading_alert(); if (overlay)
{
phpbb.loading_alert();
}
$.ajax({ $.ajax({
url: action, url: action,