loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Slightly cleaner init handling.

Browse Source
This commit is contained in:
Oliver Hamlet
2015-01-08 16:31:21 +00:00
parent 53418d6ff2
commit 21a643daa0
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/report/js/script.js
+14 -14
View File
@@ -1166,24 +1166,27 @@ function initVars() {
try {
loot.settings = JSON.parse(results[2]);
l10n.getJedInstance(loot.settings.language).then(function(jed){
l10n.translateStaticText(jed);
l10n.jed = jed;
}).catch(processCefError);
} catch (e) {
console.log(e);
console.log('getSettings response: ' + results[2]);
}
}).then(function(){
return l10n.getJedInstance(loot.settings.language).then(function(jed){
l10n.translateStaticText(jed);
l10n.jed = jed;
var promise;
/* Also need to update the settings UI. */
loot.updateSettingsUI();
}).catch(processCefError);
}).then(function(){
if (result) {
promise = new Promise(function(resolve, reject){
return new Promise(function(resolve, reject){
closeProgressDialog();
document.getElementById('settingsButton').click();
resolve('');
});
} else {
promise = loot.query('getGameData').then(function(result){
return loot.query('getGameData').then(function(result){
var game = JSON.parse(result, jsonToPlugin);
loot.game.folder = game.folder;
loot.game.masterlist = game.masterlist;
@@ -1200,14 +1203,11 @@ function initVars() {
return '';
}).catch(processCefError);
}
promise.then(function(){
if (!loot.settings.lastVersion || loot.settings.lastVersion != loot.version) {
document.getElementById('firstRun').showModal();
}
}).catch(processCefError);
}).then(function(){
if (!loot.settings.lastVersion || loot.settings.lastVersion != loot.version) {
document.getElementById('firstRun').showModal();
}
}).catch(processCefError);
}).catch(processCefError);
}
function onContentRefresh(evt) {