diff --git a/src/web/Manager.mjs b/src/web/Manager.mjs index 4e4ea1ea..0a922b04 100755 --- a/src/web/Manager.mjs +++ b/src/web/Manager.mjs @@ -4,18 +4,18 @@ * @license Apache-2.0 */ -import WorkerWaiter from "./WorkerWaiter"; -import WindowWaiter from "./WindowWaiter"; -import ControlsWaiter from "./ControlsWaiter"; -import RecipeWaiter from "./RecipeWaiter"; -import OperationsWaiter from "./OperationsWaiter"; -import InputWaiter from "./InputWaiter"; -import OutputWaiter from "./OutputWaiter"; -import OptionsWaiter from "./OptionsWaiter"; -import HighlighterWaiter from "./HighlighterWaiter"; -import SeasonalWaiter from "./SeasonalWaiter"; -import BindingsWaiter from "./BindingsWaiter"; -import BackgroundWorkerWaiter from "./BackgroundWorkerWaiter"; +import WorkerWaiter from "./waiters/WorkerWaiter"; +import WindowWaiter from "./waiters/WindowWaiter"; +import ControlsWaiter from "./waiters/ControlsWaiter"; +import RecipeWaiter from "./waiters/RecipeWaiter"; +import OperationsWaiter from "./waiters/OperationsWaiter"; +import InputWaiter from "./waiters/InputWaiter"; +import OutputWaiter from "./waiters/OutputWaiter"; +import OptionsWaiter from "./waiters/OptionsWaiter"; +import HighlighterWaiter from "./waiters/HighlighterWaiter"; +import SeasonalWaiter from "./waiters/SeasonalWaiter"; +import BindingsWaiter from "./waiters/BindingsWaiter"; +import BackgroundWorkerWaiter from "./waiters/BackgroundWorkerWaiter"; /** diff --git a/src/web/BackgroundWorkerWaiter.mjs b/src/web/waiters/BackgroundWorkerWaiter.mjs similarity index 98% rename from src/web/BackgroundWorkerWaiter.mjs rename to src/web/waiters/BackgroundWorkerWaiter.mjs index b7b259be..ed9f8c29 100644 --- a/src/web/BackgroundWorkerWaiter.mjs +++ b/src/web/waiters/BackgroundWorkerWaiter.mjs @@ -4,7 +4,7 @@ * @license Apache-2.0 */ -import ChefWorker from "worker-loader?inline&fallback=false!../core/ChefWorker"; +import ChefWorker from "worker-loader?inline&fallback=false!../../core/ChefWorker"; /** * Waiter to handle conversations with a ChefWorker in the background. diff --git a/src/web/BindingsWaiter.mjs b/src/web/waiters/BindingsWaiter.mjs similarity index 100% rename from src/web/BindingsWaiter.mjs rename to src/web/waiters/BindingsWaiter.mjs diff --git a/src/web/ControlsWaiter.mjs b/src/web/waiters/ControlsWaiter.mjs similarity index 99% rename from src/web/ControlsWaiter.mjs rename to src/web/waiters/ControlsWaiter.mjs index 41acb57e..34dc484d 100755 --- a/src/web/ControlsWaiter.mjs +++ b/src/web/waiters/ControlsWaiter.mjs @@ -4,7 +4,7 @@ * @license Apache-2.0 */ -import Utils from "../core/Utils"; +import Utils from "../../core/Utils"; /** diff --git a/src/web/HighlighterWaiter.mjs b/src/web/waiters/HighlighterWaiter.mjs similarity index 100% rename from src/web/HighlighterWaiter.mjs rename to src/web/waiters/HighlighterWaiter.mjs diff --git a/src/web/InputWaiter.mjs b/src/web/waiters/InputWaiter.mjs similarity index 99% rename from src/web/InputWaiter.mjs rename to src/web/waiters/InputWaiter.mjs index 0669f059..742ea516 100644 --- a/src/web/InputWaiter.mjs +++ b/src/web/waiters/InputWaiter.mjs @@ -5,11 +5,11 @@ * @license Apache-2.0 */ -import LoaderWorker from "worker-loader?inline&fallback=false!./LoaderWorker"; -import InputWorker from "worker-loader?inline&fallback=false!./InputWorker"; -import Utils from "../core/Utils"; -import { toBase64 } from "../core/lib/Base64"; -import { isImage } from "../core/lib/FileType"; +import LoaderWorker from "worker-loader?inline&fallback=false!../workers/LoaderWorker"; +import InputWorker from "worker-loader?inline&fallback=false!../workers/InputWorker"; +import Utils from "../../core/Utils"; +import { toBase64 } from "../../core/lib/Base64"; +import { isImage } from "../../core/lib/FileType"; /** @@ -413,7 +413,7 @@ class InputWaiter { */ resetFileThumb() { const fileThumb = document.getElementById("input-file-thumbnail"); - fileThumb.src = require("./static/images/file-128x128.png"); + fileThumb.src = require("../static/images/file-128x128.png"); } /** diff --git a/src/web/OperationsWaiter.mjs b/src/web/waiters/OperationsWaiter.mjs similarity index 99% rename from src/web/OperationsWaiter.mjs rename to src/web/waiters/OperationsWaiter.mjs index decc49d6..ffd28374 100755 --- a/src/web/OperationsWaiter.mjs +++ b/src/web/waiters/OperationsWaiter.mjs @@ -4,7 +4,7 @@ * @license Apache-2.0 */ -import HTMLOperation from "./HTMLOperation"; +import HTMLOperation from "../HTMLOperation"; import Sortable from "sortablejs"; diff --git a/src/web/OptionsWaiter.mjs b/src/web/waiters/OptionsWaiter.mjs similarity index 100% rename from src/web/OptionsWaiter.mjs rename to src/web/waiters/OptionsWaiter.mjs diff --git a/src/web/OutputWaiter.mjs b/src/web/waiters/OutputWaiter.mjs similarity index 99% rename from src/web/OutputWaiter.mjs rename to src/web/waiters/OutputWaiter.mjs index 2d98e0b3..a40cac30 100755 --- a/src/web/OutputWaiter.mjs +++ b/src/web/waiters/OutputWaiter.mjs @@ -5,9 +5,9 @@ * @license Apache-2.0 */ -import Utils from "../core/Utils"; +import Utils from "../../core/Utils"; import FileSaver from "file-saver"; -import ZipWorker from "worker-loader?inline&fallback=false!./ZipWorker"; +import ZipWorker from "worker-loader?inline&fallback=false!../workers/ZipWorker"; /** * Waiter to handle events related to the output diff --git a/src/web/RecipeWaiter.mjs b/src/web/waiters/RecipeWaiter.mjs similarity index 99% rename from src/web/RecipeWaiter.mjs rename to src/web/waiters/RecipeWaiter.mjs index f2edd725..1881eb56 100755 --- a/src/web/RecipeWaiter.mjs +++ b/src/web/waiters/RecipeWaiter.mjs @@ -4,9 +4,9 @@ * @license Apache-2.0 */ -import HTMLOperation from "./HTMLOperation"; +import HTMLOperation from "../HTMLOperation"; import Sortable from "sortablejs"; -import Utils from "../core/Utils"; +import Utils from "../../core/Utils"; /** diff --git a/src/web/SeasonalWaiter.mjs b/src/web/waiters/SeasonalWaiter.mjs similarity index 99% rename from src/web/SeasonalWaiter.mjs rename to src/web/waiters/SeasonalWaiter.mjs index f894e951..43e29ebf 100755 --- a/src/web/SeasonalWaiter.mjs +++ b/src/web/waiters/SeasonalWaiter.mjs @@ -5,8 +5,8 @@ */ import clippy from "clippyjs"; -import "./static/clippy_assets/agents/Clippy/agent.js"; -import clippyMap from "./static/clippy_assets/agents/Clippy/map.png"; +import "../static/clippy_assets/agents/Clippy/agent.js"; +import clippyMap from "../static/clippy_assets/agents/Clippy/map.png"; /** * Waiter to handle seasonal events and easter eggs. diff --git a/src/web/WindowWaiter.mjs b/src/web/waiters/WindowWaiter.mjs similarity index 100% rename from src/web/WindowWaiter.mjs rename to src/web/waiters/WindowWaiter.mjs diff --git a/src/web/WorkerWaiter.mjs b/src/web/waiters/WorkerWaiter.mjs similarity index 99% rename from src/web/WorkerWaiter.mjs rename to src/web/waiters/WorkerWaiter.mjs index c259f718..989469ea 100644 --- a/src/web/WorkerWaiter.mjs +++ b/src/web/waiters/WorkerWaiter.mjs @@ -5,7 +5,7 @@ * @license Apache-2.0 */ -import ChefWorker from "worker-loader?inline&fallback=false!../core/ChefWorker"; +import ChefWorker from "worker-loader?inline&fallback=false!../../core/ChefWorker"; /** * Waiter to handle conversations with the ChefWorker diff --git a/src/web/InputWorker.mjs b/src/web/workers/InputWorker.mjs similarity index 99% rename from src/web/InputWorker.mjs rename to src/web/workers/InputWorker.mjs index 3cdacd9b..64a81a81 100644 --- a/src/web/InputWorker.mjs +++ b/src/web/workers/InputWorker.mjs @@ -6,7 +6,7 @@ * @license Apache-2.0 */ -import Utils from "../core/Utils"; +import Utils from "../../core/Utils"; self.maxWorkers = 4; self.maxTabs = 1; diff --git a/src/web/LoaderWorker.js b/src/web/workers/LoaderWorker.js similarity index 100% rename from src/web/LoaderWorker.js rename to src/web/workers/LoaderWorker.js diff --git a/src/web/ZipWorker.mjs b/src/web/workers/ZipWorker.mjs similarity index 95% rename from src/web/ZipWorker.mjs rename to src/web/workers/ZipWorker.mjs index 6af603cc..fa020290 100644 --- a/src/web/ZipWorker.mjs +++ b/src/web/workers/ZipWorker.mjs @@ -7,8 +7,8 @@ */ import zip from "zlibjs/bin/zip.min"; -import Utils from "../core/Utils"; -import {detectFileType} from "../core/lib/FileType"; +import Utils from "../../core/Utils"; +import {detectFileType} from "../../core/lib/FileType"; const Zlib = zip.Zlib;