diff --git a/html/.eslintrc.json b/html/.eslintrc.json index 59ab954b..4540cccf 100644 --- a/html/.eslintrc.json +++ b/html/.eslintrc.json @@ -1,6 +1,6 @@ { "root": true, - "extends": ["@babel/core", "eslint:all", "prettier"], + "extends": ["eslint:all", "prettier"], "env": { "browser": true, "commonjs": true, @@ -16,7 +16,6 @@ }, "requireConfigFile": false, "babelOptions": { - "presets": ["@babel/preset-env"], "parserOpts": { "plugins": ["importAssertions"] } diff --git a/html/src/app.js b/html/src/app.js index b6efa05c..6265a4b0 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -13001,16 +13001,18 @@ speechSynthesis.getVoices(); $app.data.isStartAtWindowsStartup = configRepository.getBool( 'VRCX_StartAtWindowsStartup' ); - $app.data.isStartAsMinimizedState = - (await VRCXStorage.Get('VRCX_StartAsMinimizedState')) === 'true'; - $app.data.isCloseToTray = VRCXStorage.Get('VRCX_CloseToTray') === 'true'; + $app.data.isStartAsMinimizedState = false; + $app.data.isCloseToTray = false; + VRCXStorage.Get('VRCX_StartAsMinimizedState').then((result) => { + $app.isStartAsMinimizedState = result === 'true'; + }); + VRCXStorage.Get('VRCX_CloseToTray').then((result) => { + $app.isCloseToTray = result === 'true'; + }); if (configRepository.getBool('VRCX_CloseToTray')) { // move back to JSON $app.data.isCloseToTray = configRepository.getBool('VRCX_CloseToTray'); - await VRCXStorage.Set( - 'VRCX_CloseToTray', - $app.data.isCloseToTray.toString() - ); + VRCXStorage.Set('VRCX_CloseToTray', $app.data.isCloseToTray.toString()); configRepository.remove('VRCX_CloseToTray'); } var saveVRCXWindowOption = function () { diff --git a/html/src/repository/shared.js b/html/src/repository/shared.js index 5312a393..f37fa3f3 100644 --- a/html/src/repository/shared.js +++ b/html/src/repository/shared.js @@ -4,21 +4,21 @@ function transformKey(key) { return String(key).toLowerCase(); } -function waitSynchronous(promise) { - if (typeof promise !== 'object' || promise === null) { - return promise; - } - console.log('waitSynchronous', promise); - while (true) { - var state = promise.getState(); - if (state === 'resolved') { - return promise.get(); - } - if (state === 'rejected') { - return null; - } - } -} +// function waitSynchronous(promise) { +// if (typeof promise !== 'object' || promise === null) { +// return promise; +// } +// console.log('waitSynchronous', promise); +// while (true) { +// var state = promise.getState(); +// if (state === 'resolved') { +// return promise.get(); +// } +// if (state === 'rejected') { +// return null; +// } +// } +// } class SharedRepository { remove(key) {