diff options
| author | Cesar G <prototech91@gmail.com> | 2015-05-31 16:57:38 +0200 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2015-05-31 16:57:38 +0200 |
| commit | 4b46ac78a6ee1bd792c0650497bc09b55e7fffb1 (patch) | |
| tree | 9c674505f0fd8e638ed5ef277b299f1abf1385d0 /phpBB | |
| parent | 7a66d622900ff993def8c5148eccecb64159f874 (diff) | |
| parent | db3782e4912e2945a546309dab38a4c00bd0f5c5 (diff) | |
| download | forums-4b46ac78a6ee1bd792c0650497bc09b55e7fffb1.tar forums-4b46ac78a6ee1bd792c0650497bc09b55e7fffb1.tar.gz forums-4b46ac78a6ee1bd792c0650497bc09b55e7fffb1.tar.bz2 forums-4b46ac78a6ee1bd792c0650497bc09b55e7fffb1.tar.xz forums-4b46ac78a6ee1bd792c0650497bc09b55e7fffb1.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13905] Don't load loading.gif until needed.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 5709941286..cc016e52ee 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -15,7 +15,7 @@ var keymap = { }; var $dark = $('#darkenwrapper'); -var $loadingIndicator = $('#loading_indicator'); +var $loadingIndicator; var phpbbAlertTimer = null; phpbb.isTouch = (window && typeof window.ontouchstart !== 'undefined'); @@ -26,6 +26,11 @@ phpbb.isTouch = (window && typeof window.ontouchstart !== 'undefined'); * @returns {object} Returns loadingIndicator. */ phpbb.loadingIndicator = function() { + if (!$loadingIndicator) { + $loadingIndicator = $('<div />', { id: 'loading_indicator' }); + $loadingIndicator.appendTo('#page-footer'); + } + if (!$loadingIndicator.is(':visible')) { $loadingIndicator.fadeIn(phpbb.alertTime); // Wait fifteen seconds and display an error if nothing has been returned by then. diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 8749ce60e8..ecba72f6f4 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -18,7 +18,6 @@ <div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}"> <div id="darken"> </div> </div> - <div id="loading_indicator"></div> <div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> <a href="#" class="alert_close"></a> |