[refactor] Moved Settings to TypeScript

Moved the UI binding to a separate file as there is still a circular
dependency with 'engine'. But every other file that depends on Settings
is no longer part of a larger dependency cycle.
This commit is contained in:
Steven Evans
2018-07-30 23:02:12 -04:00
parent 826a8799fa
commit 974bc3c002
5 changed files with 155 additions and 44 deletions
+7 -7
View File
@@ -13,7 +13,7 @@ import {loadMessages, initMessages, Messages} from "./Message";
import {Player, loadPlayer} from "./Player";
import {loadAllRunningScripts} from "./Script";
import {AllServers, loadAllServers} from "./Server";
import {loadSettings, initSettings, Settings} from "./Settings";
import {Settings} from "./Settings";
import {loadSpecialServerIps, SpecialServerIps} from "./SpecialServerIps";
import {loadStockMarket, StockMarket} from "./StockMarket";
import {dialogBoxCreate} from "../utils/DialogBox";
@@ -169,13 +169,13 @@ function loadGame(saveString) {
}
if (saveObj.hasOwnProperty("SettingsSave")) {
try {
loadSettings(saveObj.SettingsSave);
Settings.load(saveObj.SettingsSave);
} catch(e) {
console.log("ERROR: Failed to parse Settings. Re-initing default values");
initSettings();
Settings.init();
}
} else {
initSettings();
Settings.init();
}
if (saveObj.hasOwnProperty("FconfSettingsSave")) {
try {
@@ -388,12 +388,12 @@ function loadImportedGame(saveObj, saveString) {
}
if (saveObj.hasOwnProperty("SettingsSave")) {
try {
loadSettings(saveObj.SettingsSave);
Settings.load(saveObj.SettingsSave);
} catch(e) {
initSettings();
Settings.init();
}
} else {
initSettings();
Settings.init();
}
if (saveObj.hasOwnProperty("FconfSettingsSave")) {
try {