diff options
| author | Cesar G <prototech91@gmail.com> | 2013-11-03 10:49:28 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2013-11-03 10:49:28 -0800 |
| commit | 478c3ea3a07437e752331ee74ccb20f52c3ab4c9 (patch) | |
| tree | 23c69061e12e4b68be8c4070807b89f905525257 /phpBB/assets | |
| parent | 4b024f035e0b49bea40932ff4a1180766fa7639a (diff) | |
| download | forums-478c3ea3a07437e752331ee74ccb20f52c3ab4c9.tar forums-478c3ea3a07437e752331ee74ccb20f52c3ab4c9.tar.gz forums-478c3ea3a07437e752331ee74ccb20f52c3ab4c9.tar.bz2 forums-478c3ea3a07437e752331ee74ccb20f52c3ab4c9.tar.xz forums-478c3ea3a07437e752331ee74ccb20f52c3ab4c9.zip | |
[ticket/11928] Javascript requires camel case.
PHPBB3-11928
Diffstat (limited to 'phpBB/assets')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 1fa558721d..a3a6d75dd2 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -12,27 +12,27 @@ var keymap = { }; var dark = $('#darkenwrapper'); -var loading_indicator = $('#loading_indicator'); +var loadingIndicator = $('#loading_indicator'); var phpbbAlertTimer = null; /** * Display a loading screen * - * @returns object Returns loading_indicator. + * @returns object Returns loadingIndicator. */ -phpbb.loading_indicator = function() { - if (!loading_indicator.is(':visible')) { - loading_indicator.fadeIn(phpbb.alertTime); +phpbb.loadingIndicator = function() { + if (!loadingIndicator.is(':visible')) { + loadingIndicator.fadeIn(phpbb.alertTime); // Wait fifteen seconds and display an error if nothing has been returned by then. 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')); } }, 15000); } - return loading_indicator; + return loadingIndicator; }; /** @@ -97,8 +97,8 @@ phpbb.alert = function(title, msg, fadedark) { e.preventDefault(); }); - if (loading_indicator.is(':visible')) { - loading_indicator.fadeOut(phpbb.alertTime, function() { + if (loadingIndicator.is(':visible')) { + loadingIndicator.fadeOut(phpbb.alertTime, function() { dark.append(div); div.fadeIn(phpbb.alertTime); }); @@ -188,8 +188,8 @@ phpbb.confirm = function(msg, callback, fadedark) { e.preventDefault(); }); - if (loading_indicator.is(':visible')) { - loading_indicator.fadeOut(phpbb.alertTime, function() { + if (loadingIndicator.is(':visible')) { + loadingIndicator.fadeOut(phpbb.alertTime, function() { dark.append(div); div.fadeIn(phpbb.alertTime); }); @@ -330,7 +330,7 @@ phpbb.ajaxify = function(options) { // If confirmation is required, display a dialog to the user. phpbb.confirm(res.MESSAGE_BODY, function(del) { if (del) { - phpbb.loading_indicator(); + phpbb.loadingIndicator(); data = $('<form>' + res.S_HIDDEN_FIELDS + '</form>').serialize(); $.ajax({ 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')) { - phpbb.loading_indicator(); + phpbb.loadingIndicator(); } var request = $.ajax({ @@ -384,7 +384,7 @@ phpbb.ajaxify = function(options) { error: errorHandler }); request.always(function() { - loading_indicator.fadeOut(phpbb.alertTime); + loadingIndicator.fadeOut(phpbb.alertTime); }); event.preventDefault(); |