aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets
diff options
context:
space:
mode:
authorCHItA <mate.bartus@gmail.com>2015-06-05 17:43:30 +0200
committerMate Bartus <mate.bartus@gmail.com>2015-07-08 01:28:01 +0200
commit1b81bf5b2370c045a6369705d2a11a2b35fe2281 (patch)
treee1b2f4205fa3029734fb8fb909df067eae56cfed /phpBB/assets
parent0dc6029bfed10fac1a09a4fd8de7d1b31407693a (diff)
downloadforums-1b81bf5b2370c045a6369705d2a11a2b35fe2281.tar
forums-1b81bf5b2370c045a6369705d2a11a2b35fe2281.tar.gz
forums-1b81bf5b2370c045a6369705d2a11a2b35fe2281.tar.bz2
forums-1b81bf5b2370c045a6369705d2a11a2b35fe2281.tar.xz
forums-1b81bf5b2370c045a6369705d2a11a2b35fe2281.zip
[ticket/13740] Add better progress handling, also add log messages
PHPBB3-13740
Diffstat (limited to 'phpBB/assets')
-rw-r--r--phpBB/assets/javascript/installer.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/assets/javascript/installer.js b/phpBB/assets/javascript/installer.js
index 8afac0da78..a9a315c0d5 100644
--- a/phpBB/assets/javascript/installer.js
+++ b/phpBB/assets/javascript/installer.js
@@ -204,13 +204,14 @@
* @param progressLimit
*/
function incrementFiller($progressText, $progressFiller, progressLimit) {
- currentProgress++;
- $progressText.text(currentProgress + '%');
- $progressFiller.css('width', currentProgress + '%');
-
if (currentProgress >= progressLimit || currentProgress >= 100) {
clearInterval(progressTimer);
+ return;
}
+
+ currentProgress++;
+ $progressText.text(currentProgress + '%');
+ $progressFiller.css('width', currentProgress + '%');
}
/**