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

Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.x

Browse Source 
* callumacrae/ticket/13905:
  [ticket/13905] Don't load loading.gif until needed.
This commit is contained in:
Cesar G
2015-05-31 16:56:44 +02:00
parent 189d94e897 d978564600
commit db3782e491
2 changed files with 6 additions and 2 deletions
phpBB
assets
javascript
core.js
styles
prosilver
template
overall_footer.html

7
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.