mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 22:14:59 +02:00
Code Issues Releases Wiki Activity

[ticket/11928] Javascript requires camel case.

Browse Source 
PHPBB3-11928
This commit is contained in:
Cesar G 2013-11-03 10:49:28 -08:00
parent 4b024f035e
commit 478c3ea3a0
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,27 +12,27 @@ var keymap = {
}; };
var dark = $('#darkenwrapper'); var dark = $('#darkenwrapper');
var loading_indicator = $('#loading_indicator'); var loadingIndicator = $('#loading_indicator');
var phpbbAlertTimer = null; var phpbbAlertTimer = null;
/** /**
* Display a loading screen * Display a loading screen
* *
* @returns object Returns loading_indicator. * @returns object Returns loadingIndicator.
*/ */
phpbb.loading_indicator = function() { phpbb.loadingIndicator = function() {
if (!loading_indicator.is(':visible')) { if (!loadingIndicator.is(':visible')) {
loading_indicator.fadeIn(phpbb.alertTime); loadingIndicator.fadeIn(phpbb.alertTime);
// Wait fifteen seconds and display an error if nothing has been returned by then. // Wait fifteen seconds and display an error if nothing has been returned by then.
phpbbAlertTimer = setTimeout(function() { phpbbAlertTimer = setTimeout(function() {
if (loading_indicator.is(':visible')) { if (loadingIndicator.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'));
} }
}, 15000); }, 15000);
} }
return loading_indicator; return loadingIndicator;
}; };
/** /**
@ -97,8 +97,8 @@ phpbb.alert = function(title, msg, fadedark) {
e.preventDefault(); e.preventDefault();
}); });
if (loading_indicator.is(':visible')) { if (loadingIndicator.is(':visible')) {
loading_indicator.fadeOut(phpbb.alertTime, function() { loadingIndicator.fadeOut(phpbb.alertTime, function() {
dark.append(div); dark.append(div);
div.fadeIn(phpbb.alertTime); div.fadeIn(phpbb.alertTime);
}); });
@ -188,8 +188,8 @@ phpbb.confirm = function(msg, callback, fadedark) {
e.preventDefault(); e.preventDefault();
}); });
if (loading_indicator.is(':visible')) { if (loadingIndicator.is(':visible')) {
loading_indicator.fadeOut(phpbb.alertTime, function() { loadingIndicator.fadeOut(phpbb.alertTime, function() {
dark.append(div); dark.append(div);
div.fadeIn(phpbb.alertTime); div.fadeIn(phpbb.alertTime);
}); });
@ -330,7 +330,7 @@ phpbb.ajaxify = function(options) {
// If confirmation is required, display a dialog to the user. // If confirmation is required, display a dialog to the user.
phpbb.confirm(res.MESSAGE_BODY, function(del) { phpbb.confirm(res.MESSAGE_BODY, function(del) {
if (del) { if (del) {
phpbb.loading_indicator(); phpbb.loadingIndicator();
data = $('<form>' + res.S_HIDDEN_FIELDS + '</form>').serialize(); data = $('<form>' + res.S_HIDDEN_FIELDS + '</form>').serialize();
$.ajax({ $.ajax({
url: res.S_CONFIRM_ACTION, url: res.S_CONFIRM_ACTION,
@ -373,7 +373,7 @@ phpbb.ajaxify = function(options) {
} }
if (overlay && (typeof $this.attr('data-overlay') === 'undefined' || $this.attr('data-overlay') === 'true')) { if (overlay && (typeof $this.attr('data-overlay') === 'undefined' || $this.attr('data-overlay') === 'true')) {
phpbb.loading_indicator(); phpbb.loadingIndicator();
} }
var request = $.ajax({ var request = $.ajax({
@ -384,7 +384,7 @@ phpbb.ajaxify = function(options) {
error: errorHandler error: errorHandler
}); });
request.always(function() { request.always(function() {
loading_indicator.fadeOut(phpbb.alertTime); loadingIndicator.fadeOut(phpbb.alertTime);
}); });
event.preventDefault(); event.preventDefault();