Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made requested changes and changed how it loads

Browse source
This commit is contained in:
Fluffy Jenkins 2020-01-29 19:50:23 +00:00
parent a66bbcb125
commit 5492759a0c
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/defaultScripts.js
View file

@ -54,7 +54,7 @@ var MENU_ITEM = "Debug defaultScripts.js";
var SETTINGS_KEY = '_debugDefaultScriptsIsChecked'; var SETTINGS_KEY = '_debugDefaultScriptsIsChecked';
var SETTINGS_KEY_BETA = '_betaDefaultScriptsIsChecked'; var SETTINGS_KEY_BETA = '_betaDefaultScriptsIsChecked';
var previousSetting = Settings.getValue(SETTINGS_KEY, false);; var previousSetting = Settings.getValue(SETTINGS_KEY, false);
var previousSettingBeta = Settings.getValue(SETTINGS_KEY_BETA, false); var previousSettingBeta = Settings.getValue(SETTINGS_KEY_BETA, false);
if (previousSetting === '' || previousSetting === false || previousSetting === 'false') { if (previousSetting === '' || previousSetting === false || previousSetting === 'false') {
@ -73,6 +73,7 @@ if (Menu.menuExists(MENU_CATEGORY) && !Menu.menuItemExists(MENU_CATEGORY, MENU_I
isChecked: previousSetting, isChecked: previousSetting,
}); });
} }
function loadSeparateDefaults() { function loadSeparateDefaults() {
var currentlyRunningScripts = ScriptDiscoveryService.getRunning(); var currentlyRunningScripts = ScriptDiscoveryService.getRunning();
@ -81,7 +82,7 @@ function loadSeparateDefaults() {
var scriptItem = DEFAULT_SCRIPTS_SEPARATE[i]; var scriptItem = DEFAULT_SCRIPTS_SEPARATE[i];
if (typeof scriptItem === "object") { if (typeof scriptItem === "object") {
if (previousSettingBeta) { if (previousSettingBeta) {
console.info("Loading Beta item " + scriptItem.beta); console.log("Loading Beta item " + scriptItem.beta);
scriptItem = scriptItem.beta; scriptItem = scriptItem.beta;
} else { } else {
scriptItem = scriptItem.stable; scriptItem = scriptItem.stable;
@ -92,7 +93,11 @@ function loadSeparateDefaults() {
var currentRunningScriptObject = currentlyRunningScripts[j]; var currentRunningScriptObject = currentlyRunningScripts[j];
var currentDefaultScriptName = scriptItem.substr((scriptItem.lastIndexOf("/") + 1), scriptItem.length); var currentDefaultScriptName = scriptItem.substr((scriptItem.lastIndexOf("/") + 1), scriptItem.length);
if (currentDefaultScriptName === currentRunningScriptObject.name) { if (currentDefaultScriptName === currentRunningScriptObject.name) {
ScriptDiscoveryService.stopScript(currentRunningScriptObject.url); if (currentRunningScriptObject.url !== scriptItem) {
ScriptDiscoveryService.stopScript(currentRunningScriptObject.url);
} else {
shouldLoadCurrentDefaultScript = false;
}
} }
} }