diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-04-12 21:07:18 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-04-12 21:07:18 +0200 |
| commit | 1828d74502c800acd9eb8b87438e628f59b10dad (patch) | |
| tree | b3f2d9d71a5dcfc7193505e2194d5b0cbcc692c1 | |
| parent | 3ece096a1e83dc270da84559d76b164425c8c9df (diff) | |
| parent | 7a9d9f97ef83b61ce155a09c1e75c90f4c533f3f (diff) | |
| download | forums-1828d74502c800acd9eb8b87438e628f59b10dad.tar forums-1828d74502c800acd9eb8b87438e628f59b10dad.tar.gz forums-1828d74502c800acd9eb8b87438e628f59b10dad.tar.bz2 forums-1828d74502c800acd9eb8b87438e628f59b10dad.tar.xz forums-1828d74502c800acd9eb8b87438e628f59b10dad.zip | |
Merge remote-tracking branch 'marc1706/ticket/10784' into develop
* marc1706/ticket/10784:
[ticket/10784] Do not show ajax overlay unless needed
| -rw-r--r-- | phpBB/adm/style/ajax.js | 12 | ||||
| -rw-r--r-- | phpBB/assets/javascript/core.js | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index fd2f7a2122..12541cb057 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -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 }); } }); diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index c41edfa145..958b6c9ff6 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -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, |