makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14487] Update javascript

Browse source 
PHPBB3-14487
This commit is contained in:
Máté Bartus 2016-02-29 16:18:35 +01:00
parent 062358f8b1
commit 8993fef9c0
1 changed files with 50 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
phpBB/assets/javascript/installer.js
View file

@ -13,9 +13,7 @@
var currentProgress = 0;
var refreshRequested = false;
var transmissionOver = false;
var status = '';
var statusCount = 0;
var statusTimeout = null;
// Template related variables
var $contentWrapper = $('.install-body').find('.main');
@ -341,6 +339,55 @@
}
}
/**
* Processes status data
*
* @param status
*/
function processTimeoutResponse(status) {
if (statusCount === 12) { // 1 minute hard cap
status = 'fail';
}
if (status === 'continue') {
refreshRequested = false;
doRefresh();
} else if (status === 'running') {
statusCount++;
setTimeout(queryInstallerStatus, 5000);
} else {
addMessage('error',
[{
title: installLang.title,
description: installLang.msg
}]
);
}
}
/**
* Queries the installer's status
*/
function queryInstallerStatus() {
var url = $(location).attr('pathname');
var lookUp = 'install/app.php';
var position = url.indexOf(lookUp);
if (position === -1) {
lookUp = 'install';
position = url.indexOf(lookUp);
if (position === -1) {
return false;
}
}
url = url.substring(0, position) + lookUp + '/installer/status';
$.getJSON(url, function(data) {
processTimeoutResponse(data.status);
});
}
/**
* Process updates in streamed response
*
@ -375,45 +422,8 @@
}
if (timeoutDetected) {
status = queryInstallerStatus();
statusCount = 0;
if (status === 'continue') {
refreshRequested = false;
doRefresh();
} else if (status === 'running') {
statusTimeout = setTimeout(function() {
var s = queryInstallerStatus();
if (statusCount === 12) { // 1 minute hard cap
s = 'fail';
}
if (s === 'continue') {
refreshRequested = false;
doRefresh();
clearTimeout(statusTimeout);
} else if (s === 'fail') {
addMessage('error',
[{
title: installLang.title,
description: installLang.msg
}]
);
clearTimeout(statusTimeout);
}
statusCount++;
},
5000
);
} else {
addMessage('error',
[{
title: installLang.title,
description: installLang.msg
}]
);
}
queryInstallerStatus();
}
}
}
@ -600,18 +610,4 @@
submitForm($form, $(this));
});
}
/**
* Queries the installer's status
*/
function queryInstallerStatus()
{
var data = null;
$.ajax({url: "../installer/status", dataType: "json"})
.done(function(d) {
data = d;
});
return data.status;
}
})(jQuery); // Avoid conflicts with other libraries