diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2016-02-11 13:18:30 +0100 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2016-02-12 14:31:28 +0100 |
| commit | 955b9ede33c5696173a760ea271ec32d79e843b9 (patch) | |
| tree | eaff0198ca89ed5b6d76ee56b797a105837226d2 /phpBB/assets/javascript | |
| parent | 0210a6298d9dd39ddb15a1e0b8f49f7821cd460f (diff) | |
| download | forums-955b9ede33c5696173a760ea271ec32d79e843b9.tar forums-955b9ede33c5696173a760ea271ec32d79e843b9.tar.gz forums-955b9ede33c5696173a760ea271ec32d79e843b9.tar.bz2 forums-955b9ede33c5696173a760ea271ec32d79e843b9.tar.xz forums-955b9ede33c5696173a760ea271ec32d79e843b9.zip | |
[ticket/14462] Further speed improvements
- Cache the secondary container
- Only initialize tasks/modules that are being used
- Add timeout error message in the AJAX UI
PHPBB3-14462
Diffstat (limited to 'phpBB/assets/javascript')
| -rw-r--r-- | phpBB/assets/javascript/installer.js | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/installer.js b/phpBB/assets/javascript/installer.js index 4a4f381844..0e54654ff1 100644 --- a/phpBB/assets/javascript/installer.js +++ b/phpBB/assets/javascript/installer.js @@ -12,6 +12,7 @@ var progressTimer = null; var currentProgress = 0; var refreshRequested = false; + var transmissionOver = false; // Template related variables var $contentWrapper = $('.install-body').find('.main'); @@ -329,6 +330,12 @@ if (responseObject.hasOwnProperty('redirect')) { redirect(responseObject.redirect.url, responseObject.redirect.use_ajax); } + + if (responseObject.hasOwnProperty('over')) { + if (responseObject.over) { + transmissionOver = true; + } + } } /** @@ -357,10 +364,21 @@ $('#loading_indicator').css('display', 'none'); resetPolling(); + var timeoutDetected = !transmissionOver; + if (refreshRequested) { refreshRequested = false; doRefresh(); } + + if (timeoutDetected) { + addMessage('error', + [{ + title:'The installer detected a timeout.', + description: 'The installer has detected a timeout, you may try to refresh the page, that may lead to data corruption. We suggest that you either increase your timeout settings or try to use the CLI.' + }] + ); + } } } @@ -420,6 +438,7 @@ */ function startPolling(xhReq) { resetPolling(); + transmissionOver = false; pollTimer = setInterval(function () { pollContent(xhReq); }, 250); |