From 9fbef2c163a5a9477ac805ce6e4d250bb777d6ea Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Wed, 10 May 2023 23:08:14 +1200 Subject: [PATCH] [#181] cleanup to prep draft PR for PR --- src/core/ChefWorker.js | 3 ++- src/core/Recipe.mjs | 2 +- src/core/lib/Magic.mjs | 2 +- src/web/App.mjs | 5 +++-- src/web/Manager.mjs | 1 - src/web/waiters/OperationsWaiter.mjs | 1 - 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/ChefWorker.js b/src/core/ChefWorker.js index a43993f9..0bdedab5 100644 --- a/src/core/ChefWorker.js +++ b/src/core/ChefWorker.js @@ -7,7 +7,8 @@ */ import Chef from "./Chef.mjs"; -import OperationConfig from "./config/OperationConfig.json" assert {type: "json"}; +// @TODO dolphin: import OperationConfig from "./config/OperationConfig.json" assert {type: "json"}; +import OperationConfig from "./config/OperationConfig.json"; import OpModules from "./config/modules/OpModules.mjs"; import loglevelMessagePrefix from "loglevel-message-prefix"; diff --git a/src/core/Recipe.mjs b/src/core/Recipe.mjs index 2af347cd..1b981bca 100755 --- a/src/core/Recipe.mjs +++ b/src/core/Recipe.mjs @@ -4,7 +4,7 @@ * @license Apache-2.0 */ -// import OperationConfig from "./config/OperationConfig.json" assert {type: "json"}; +// @TODO dolphin: import OperationConfig from "./config/OperationConfig.json" assert {type: "json"}; import OperationConfig from "./config/OperationConfig.json"; import OperationError from "./errors/OperationError.mjs"; import Operation from "./Operation.mjs"; diff --git a/src/core/lib/Magic.mjs b/src/core/lib/Magic.mjs index 5dab70bb..b6de2158 100644 --- a/src/core/lib/Magic.mjs +++ b/src/core/lib/Magic.mjs @@ -1,4 +1,4 @@ -// import OperationConfig from "../config/OperationConfig.json" assert {type: "json"}; +// @TODO dolphin: import OperationConfig from "../config/OperationConfig.json" assert {type: "json"}; import OperationConfig from "../config/OperationConfig.json"; import Utils, { isWorkerEnvironment } from "../Utils.mjs"; import Recipe from "../Recipe.mjs"; diff --git a/src/web/App.mjs b/src/web/App.mjs index 0e119ec2..88b322ed 100755 --- a/src/web/App.mjs +++ b/src/web/App.mjs @@ -60,7 +60,6 @@ class App { document.dispatchEvent(this.manager.appstart); this.initialiseUI(); - this.setCompileMessage(); this.loadLocalStorage(); this.populateOperationsList(); this.manager.setup(); @@ -472,8 +471,9 @@ class App { this.saveFavourites(favourites); this.loadFavourites(); this.populateOperationsList(); - this.manager.recipe.updateSelectedOperations(); this.manager.recipe.initialiseOperationDragNDrop(); + this.manager.recipe.updateSelectedOperations(); + } /** @@ -875,6 +875,7 @@ class App { */ setDesktopUI(minimise) { $("[data-toggle=tooltip]").tooltip("enable"); + this.setCompileMessage(); this.setDesktopSplitter(minimise); this.adjustComponentSizes(); this.populateOperationsList(); diff --git a/src/web/Manager.mjs b/src/web/Manager.mjs index d088a0c3..2af4813d 100755 --- a/src/web/Manager.mjs +++ b/src/web/Manager.mjs @@ -204,7 +204,6 @@ class Manager { document.getElementById("save-all-to-file").addEventListener("click", this.output.saveAllClick.bind(this.output)); document.getElementById("copy-output").addEventListener("click", this.output.copyClick.bind(this.output)); document.getElementById("switch").addEventListener("click", this.output.switchClick.bind(this.output)); - // document.getElementById("maximise-output").addEventListener("click", this.output.maximiseOutputClick.bind(this.output)); document.getElementById("magic").addEventListener("click", this.output.magicClick.bind(this.output)); this.addDynamicListener(".extract-file,.extract-file i", "click", this.output.extractFileClick, this.output); this.addDynamicListener("#output-tabs-wrapper #output-tabs li .output-tab-content", "click", this.output.changeTabClick, this.output); diff --git a/src/web/waiters/OperationsWaiter.mjs b/src/web/waiters/OperationsWaiter.mjs index 15a75029..f3a39e3e 100755 --- a/src/web/waiters/OperationsWaiter.mjs +++ b/src/web/waiters/OperationsWaiter.mjs @@ -11,7 +11,6 @@ import {fuzzyMatch, calcMatchRanges} from "../../core/lib/FuzzyMatch.mjs"; /** * Waiter to handle events related to the operations. - * Waiter to handle events related to the operations */ class OperationsWaiter {