From 6a271e067fa917614f4c81f473533e24c6d04404 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sat, 13 Feb 2021 22:52:28 -0500 Subject: Move mixed/js (#1383) * Move mixed/js/core.js to js/core.js * Move mixed/js/yomichan.js to js/yomichan.js * Move mixed/js/timer.js to js/debug/timer.js * Move mixed/js/hotkey-handler.js to js/input/hotkey-handler.js * Move mixed/js/hotkey-help-controller.js to js/input/hotkey-help-controller.js * Move mixed/js/hotkey-util.js to js/input/hotkey-util.js * Move mixed/js/audio-system.js to js/input/audio-system.js * Move mixed/js/media-loader.js to js/input/media-loader.js * Move mixed/js/text-to-speech-audio.js to js/input/text-to-speech-audio.js * Move mixed/js/comm.js to js/comm/cross-frame-api.js * Move mixed/js/api.js to js/comm/api.js * Move mixed/js/frame-client.js to js/comm/frame-client.js * Move mixed/js/frame-endpoint.js to js/comm/frame-endpoint.js * Move mixed/js/display.js to js/display/display.js * Move mixed/js/display-audio.js to js/display/display-audio.js * Move mixed/js/display-generator.js to js/display/display-generator.js * Move mixed/js/display-history.js to js/display/display-history.js * Move mixed/js/display-notification.js to js/display/display-notification.js * Move mixed/js/display-profile-selection.js to js/display/display-profile-selection.js * Move mixed/js/japanese.js to js/language/japanese-util.js * Move mixed/js/dictionary-data-util.js to js/language/dictionary-data-util.js * Move mixed/js/document-focus-controller.js to js/dom/document-focus-controller.js * Move mixed/js/document-util.js to js/dom/document-util.js * Move mixed/js/dom-data-binder.js to js/dom/dom-data-binder.js * Move mixed/js/html-template-collection.js to js/dom/html-template-collection.js * Move mixed/js/panel-element.js to js/dom/panel-element.js * Move mixed/js/popup-menu.js to js/dom/popup-menu.js * Move mixed/js/selector-observer.js to js/dom/selector-observer.js * Move mixed/js/scroll.js to js/dom/window-scroll.js * Move mixed/js/text-scanner.js to js/language/text-scanner.js * Move mixed/js/cache-map.js to js/general/cache-map.js * Move mixed/js/object-property-accessor.js to js/general/object-property-accessor.js * Move mixed/js/task-accumulator.js to js/general/task-accumulator.js * Move mixed/js/environment.js to js/background/environment.js * Move mixed/js/dynamic-loader.js to js/scripting/dynamic-loader.js * Move mixed/js/dynamic-loader-sentinel.js to js/scripting/dynamic-loader-sentinel.js --- test/test-cache-map.js | 2 +- test/test-core.js | 2 +- test/test-database.js | 4 ++-- test/test-document-util.js | 2 +- test/test-hotkey-util.js | 2 +- test/test-japanese.js | 2 +- test/test-object-property-accessor.js | 2 +- test/test-options-util.js | 4 ++-- test/test-profile-conditions.js | 4 ++-- test/test-schema.js | 4 ++-- test/test-translator.js | 6 +++--- 11 files changed, 17 insertions(+), 17 deletions(-) (limited to 'test') diff --git a/test/test-cache-map.js b/test/test-cache-map.js index 4d19015b..b01f5ed8 100644 --- a/test/test-cache-map.js +++ b/test/test-cache-map.js @@ -21,7 +21,7 @@ const {VM} = require('../dev/vm'); const vm = new VM({console}); vm.execute([ - 'mixed/js/cache-map.js' + 'js/general/cache-map.js' ]); const CacheMap = vm.get('CacheMap'); diff --git a/test/test-core.js b/test/test-core.js index cb315c08..cf9a5c35 100644 --- a/test/test-core.js +++ b/test/test-core.js @@ -30,7 +30,7 @@ const vm = new VM({ } }); vm.execute([ - 'mixed/js/core.js' + 'js/core.js' ]); const [DynamicProperty, deepEqual] = vm.get(['DynamicProperty', 'deepEqual']); diff --git a/test/test-database.js b/test/test-database.js index 4ac0dae6..8b075fd4 100644 --- a/test/test-database.js +++ b/test/test-database.js @@ -23,8 +23,8 @@ const {DatabaseVM} = require('../dev/database-vm'); const vm = new DatabaseVM(); vm.execute([ - 'mixed/js/core.js', - 'mixed/js/cache-map.js', + 'js/core.js', + 'js/general/cache-map.js', 'bg/js/json-schema.js', 'bg/js/media-utility.js', 'bg/js/dictionary-importer.js', diff --git a/test/test-document-util.js b/test/test-document-util.js index 2311e25f..5c6a3894 100644 --- a/test/test-document-util.js +++ b/test/test-document-util.js @@ -97,7 +97,7 @@ async function testDocument1() { 'fg/js/dom-text-scanner.js', 'fg/js/text-source-range.js', 'fg/js/text-source-element.js', - 'mixed/js/document-util.js' + 'js/dom/document-util.js' ]); const [DOMTextScanner, TextSourceRange, TextSourceElement, DocumentUtil] = vm.get([ 'DOMTextScanner', diff --git a/test/test-hotkey-util.js b/test/test-hotkey-util.js index 1388c538..eb4cf0b3 100644 --- a/test/test-hotkey-util.js +++ b/test/test-hotkey-util.js @@ -26,7 +26,7 @@ function clone(value) { function createHotkeyUtil() { const vm = new VM(); - vm.execute(['mixed/js/hotkey-util.js']); + vm.execute(['js/input/hotkey-util.js']); const [HotkeyUtil] = vm.get(['HotkeyUtil']); return new HotkeyUtil(); } diff --git a/test/test-japanese.js b/test/test-japanese.js index e83b0c1b..e2be2315 100644 --- a/test/test-japanese.js +++ b/test/test-japanese.js @@ -22,7 +22,7 @@ const {VM} = require('../dev/vm'); const vm = new VM(); vm.execute([ 'lib/wanakana.min.js', - 'mixed/js/japanese.js', + 'js/language/japanese-util.js', 'bg/js/text-source-map.js' ]); const [JapaneseUtil, TextSourceMap, wanakana] = vm.get(['JapaneseUtil', 'TextSourceMap', 'wanakana']); diff --git a/test/test-object-property-accessor.js b/test/test-object-property-accessor.js index 920cfc81..b3f05c7e 100644 --- a/test/test-object-property-accessor.js +++ b/test/test-object-property-accessor.js @@ -20,7 +20,7 @@ const {testMain} = require('../dev/util'); const {VM} = require('../dev/vm'); const vm = new VM({}); -vm.execute('mixed/js/object-property-accessor.js'); +vm.execute('js/general/object-property-accessor.js'); const ObjectPropertyAccessor = vm.get('ObjectPropertyAccessor'); diff --git a/test/test-options-util.js b/test/test-options-util.js index e4bc4e94..3e3f93bc 100644 --- a/test/test-options-util.js +++ b/test/test-options-util.js @@ -47,8 +47,8 @@ function createVM(extDir) { const vm = new VM({chrome, fetch}); vm.execute([ - 'mixed/js/core.js', - 'mixed/js/cache-map.js', + 'js/core.js', + 'js/general/cache-map.js', 'bg/js/json-schema.js', 'bg/js/template-patcher.js', 'bg/js/options.js' diff --git a/test/test-profile-conditions.js b/test/test-profile-conditions.js index 40788920..7ceda8c4 100644 --- a/test/test-profile-conditions.js +++ b/test/test-profile-conditions.js @@ -22,8 +22,8 @@ const {VM} = require('../dev/vm'); const vm = new VM({}); vm.execute([ - 'mixed/js/core.js', - 'mixed/js/cache-map.js', + 'js/core.js', + 'js/general/cache-map.js', 'bg/js/json-schema.js', 'bg/js/profile-conditions.js' ]); diff --git a/test/test-schema.js b/test/test-schema.js index f0ebd669..2c48f5f5 100644 --- a/test/test-schema.js +++ b/test/test-schema.js @@ -21,8 +21,8 @@ const {VM} = require('../dev/vm'); const vm = new VM(); vm.execute([ - 'mixed/js/core.js', - 'mixed/js/cache-map.js', + 'js/core.js', + 'js/general/cache-map.js', 'bg/js/json-schema.js' ]); const JsonSchemaValidator = vm.get('JsonSchemaValidator'); diff --git a/test/test-translator.js b/test/test-translator.js index 778a7ce1..e1161a15 100644 --- a/test/test-translator.js +++ b/test/test-translator.js @@ -36,9 +36,9 @@ async function createVM() { // Set up VM const vm = new DatabaseVM(); vm.execute([ - 'mixed/js/core.js', - 'mixed/js/cache-map.js', - 'mixed/js/japanese.js', + 'js/core.js', + 'js/general/cache-map.js', + 'js/language/japanese-util.js', 'bg/js/json-schema.js', 'bg/js/media-utility.js', 'bg/js/dictionary-importer.js', -- cgit v1.2.3