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

Merge PR #1153 branch 'marc1706/ticket/10805' into develop

Browse source 
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/10805:
  [ticket/10805] Compare phpbbAlertTimer against null
  [ticket/10805] Clear loading alert timeout after ajax request finished
This commit is contained in:
Oleg Pudeyev 2013-01-02 16:56:38 -05:00
commit 300b8236eb
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,7 @@ var keymap = {
var dark = $('#darkenwrapper'); var dark = $('#darkenwrapper');
var loading_alert = $('#loadingalert'); var loading_alert = $('#loadingalert');
var phpbbAlertTimer = null;
/** /**
@ -30,7 +31,7 @@ phpbb.loading_alert = function() {
loading_alert.show(); loading_alert.show();
dark.fadeIn(phpbb.alert_time, function() { dark.fadeIn(phpbb.alert_time, function() {
// Wait five seconds and display an error if nothing has been returned by then. // Wait five seconds and display an error if nothing has been returned by then.
setTimeout(function() { phpbbAlertTimer = setTimeout(function() {
if (loading_alert.is(':visible')) if (loading_alert.is(':visible'))
{ {
phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req')); phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req'));
@ -42,6 +43,16 @@ phpbb.loading_alert = function() {
return loading_alert; return loading_alert;
} }
/**
* Clear loading alert timeout
*/
phpbb.clearLoadingTimeout = function() {
if (phpbbAlertTimer != null) {
clearTimeout(phpbbAlertTimer);
phpbbAlertTimer = null;
}
}
/** /**
* Display a simple alert similar to JSs native alert(). * Display a simple alert similar to JSs native alert().
* *
@ -271,6 +282,8 @@ phpbb.ajaxify = function(options) {
{ {
var alert; var alert;
phpbb.clearLoadingTimeout();
// Is a confirmation required? // Is a confirmation required?
if (typeof res.S_CONFIRM_ACTION === 'undefined') if (typeof res.S_CONFIRM_ACTION === 'undefined')
{ {
@ -341,6 +354,7 @@ phpbb.ajaxify = function(options) {
{ {
var alert; var alert;
phpbb.clearLoadingTimeout();
alert = phpbb.alert(dark.attr('data-ajax-error-title'), dark.attr('data-ajax-error-text')); alert = phpbb.alert(dark.attr('data-ajax-error-title'), dark.attr('data-ajax-error-text'));
} }