mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/11928] Replace AJAX loading popup with animation.

Browse Source 
PHPBB3-11928
This commit is contained in:
Cesar G
2013-10-15 21:37:53 -07:00
parent 2f1cf0d287
commit da4e0c4219
8 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
phpBB/assets/javascript/core.js
View File

@@ -12,7 +12,7 @@ var keymap = {
};
var dark = $('#darkenwrapper');
var loadingAlert = $('#loadingalert');
var loadingAlert = $('#loading_indicator');
var phpbbAlertTimer = null;
@@ -22,18 +22,14 @@ var phpbbAlertTimer = null;
* @returns object Returns loadingAlert.
*/
phpbb.loadingAlert = function() {
if (dark.is(':visible')) {
if (!loadingAlert.is(':visible')) {
loadingAlert.fadeIn(phpbb.alertTime);
} else {
loadingAlert.show();
dark.fadeIn(phpbb.alertTime, function() {
// Wait fifteen seconds and display an error if nothing has been returned by then.
phpbbAlertTimer = setTimeout(function() {
if (loadingAlert.is(':visible')) {
phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req'));
}
}, 15000);
});
// Wait fifteen seconds and display an error if nothing has been returned by then.
phpbbAlertTimer = setTimeout(function() {
if (loadingAlert.is(':visible')) {
phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req'));
}
}, 15000);
}
return loadingAlert;
@@ -66,6 +62,10 @@ phpbb.alert = function(title, msg, fadedark) {
div.find('.alert_title').html(title);
div.find('.alert_text').html(msg);
if (!dark.is(':visible')) {
dark.fadeIn(phpbb.alertTime);
}
div.bind('click', function(e) {
e.stopPropagation();
});
@@ -131,6 +131,10 @@ phpbb.confirm = function(msg, callback, fadedark) {
var div = $('#phpbb_confirm');
div.find('.alert_text').html(msg);
if (!dark.is(':visible')) {
dark.fadeIn(phpbb.alertTime);
}
div.bind('click', function(e) {
e.stopPropagation();
});
@@ -372,13 +376,16 @@ phpbb.ajaxify = function(options) {
phpbb.loadingAlert();
}
$.ajax({
var request = $.ajax({
url: action,
type: method,
data: data,
success: returnHandler,
error: errorHandler
});
request.always(function() {
loadingAlert.fadeOut(phpbb.alertTime);
});
event.preventDefault();
});