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
This commit is contained in:
toasted-nutbread 2021-02-13 22:52:28 -05:00 committed by GitHub
parent deed5027cd
commit 6a271e067f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
66 changed files with 209 additions and 209 deletions

View File

@ -84,9 +84,9 @@
"overrides": [ "overrides": [
{ {
"files": [ "files": [
"ext/mixed/js/core.js", "ext/js/core.js",
"ext/bg/js/template-renderer.js", "ext/bg/js/template-renderer.js",
"ext/mixed/js/dictionary-data-util.js" "ext/js/language/dictionary-data-util.js"
], ],
"env": { "env": {
"webextensions": false "webextensions": false
@ -95,10 +95,10 @@
{ {
"files": ["ext/**/*.js"], "files": ["ext/**/*.js"],
"excludedFiles": [ "excludedFiles": [
"ext/mixed/js/core.js", "ext/js/core.js",
"ext/bg/js/template-renderer.js", "ext/bg/js/template-renderer.js",
"ext/bg/js/anki-note-data.js", "ext/bg/js/anki-note-data.js",
"ext/mixed/js/dictionary-data-util.js" "ext/js/language/dictionary-data-util.js"
], ],
"globals": { "globals": {
"serializeError": "readonly", "serializeError": "readonly",
@ -120,15 +120,15 @@
{ {
"files": ["ext/**/*.js"], "files": ["ext/**/*.js"],
"excludedFiles": [ "excludedFiles": [
"ext/mixed/js/core.js", "ext/js/core.js",
"ext/mixed/js/yomichan.js" "ext/js/yomichan.js"
], ],
"globals": { "globals": {
"yomichan": "readonly" "yomichan": "readonly"
} }
}, },
{ {
"files": ["ext/mixed/js/yomichan.js"], "files": ["ext/js/yomichan.js"],
"globals": { "globals": {
"chrome": "writable" "chrome": "writable"
} }
@ -158,13 +158,13 @@
}, },
{ {
"files": [ "files": [
"ext/mixed/js/core.js", "ext/js/core.js",
"ext/mixed/js/yomichan.js", "ext/js/yomichan.js",
"ext/mixed/js/environment.js", "ext/js/background/environment.js",
"ext/mixed/js/japanese.js", "ext/js/language/japanese-util.js",
"ext/mixed/js/cache-map.js", "ext/js/general/cache-map.js",
"ext/mixed/js/dictionary-data-util.js", "ext/js/language/dictionary-data-util.js",
"ext/mixed/js/object-property-accessor.js", "ext/js/general/object-property-accessor.js",
"ext/bg/js/anki.js", "ext/bg/js/anki.js",
"ext/bg/js/audio-downloader.js", "ext/bg/js/audio-downloader.js",
"ext/bg/js/clipboard-monitor.js", "ext/bg/js/clipboard-monitor.js",

View File

@ -39,15 +39,15 @@
"file://*/*" "file://*/*"
], ],
"js": [ "js": [
"mixed/js/core.js", "js/core.js",
"mixed/js/yomichan.js", "js/yomichan.js",
"mixed/js/comm.js", "js/comm/cross-frame-api.js",
"mixed/js/api.js", "js/comm/api.js",
"mixed/js/dynamic-loader.js", "js/script/dynamic-loader.js",
"mixed/js/frame-client.js", "js/comm/frame-client.js",
"mixed/js/text-scanner.js", "js/language/text-scanner.js",
"mixed/js/document-util.js", "js/dom/document-util.js",
"mixed/js/hotkey-handler.js", "js/input/hotkey-handler.js",
"fg/js/dom-text-scanner.js", "fg/js/dom-text-scanner.js",
"fg/js/popup.js", "fg/js/popup.js",
"fg/js/text-source-range.js", "fg/js/text-source-range.js",

View File

@ -22,8 +22,8 @@ const {VM} = require('./vm');
const vm = new VM(); const vm = new VM();
vm.execute([ vm.execute([
'mixed/js/core.js', 'js/core.js',
'mixed/js/cache-map.js', 'js/general/cache-map.js',
'bg/js/json-schema.js' 'bg/js/json-schema.js'
]); ]);
const JsonSchemaValidator = vm.get('JsonSchemaValidator'); const JsonSchemaValidator = vm.get('JsonSchemaValidator');

View File

@ -20,8 +20,8 @@ const {VM} = require('./vm');
const vm = new VM(); const vm = new VM();
vm.execute([ vm.execute([
'mixed/js/core.js', 'js/core.js',
'mixed/js/cache-map.js', 'js/general/cache-map.js',
'bg/js/json-schema.js' 'bg/js/json-schema.js'
]); ]);
const JsonSchemaValidator = vm.get('JsonSchemaValidator'); const JsonSchemaValidator = vm.get('JsonSchemaValidator');

View File

@ -81,13 +81,13 @@
</a> </a>
</div> </div>
<script src="/mixed/js/core.js"></script> <script src="/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/js/yomichan.js"></script>
<script src="/mixed/js/comm.js"></script> <script src="/js/comm/cross-frame-api.js"></script>
<script src="/mixed/js/api.js"></script> <script src="/js/comm/api.js"></script>
<script src="/mixed/js/hotkey-help-controller.js"></script> <script src="/js/input/hotkey-help-controller.js"></script>
<script src="/mixed/js/hotkey-util.js"></script> <script src="/js/input/hotkey-util.js"></script>
<script src="/bg/js/permissions-util.js"></script> <script src="/bg/js/permissions-util.js"></script>

View File

@ -17,14 +17,14 @@
<script src="/lib/wanakana.min.js"></script> <script src="/lib/wanakana.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/js/yomichan.js"></script>
<script src="/mixed/js/environment.js"></script> <script src="/js/background/environment.js"></script>
<script src="/mixed/js/japanese.js"></script> <script src="/js/language/japanese-util.js"></script>
<script src="/mixed/js/cache-map.js"></script> <script src="/js/general/cache-map.js"></script>
<script src="/mixed/js/dictionary-data-util.js"></script> <script src="/js/language/dictionary-data-util.js"></script>
<script src="/mixed/js/object-property-accessor.js"></script> <script src="/js/general/object-property-accessor.js"></script>
<script src="/bg/js/anki.js"></script> <script src="/bg/js/anki.js"></script>
<script src="/bg/js/audio-downloader.js"></script> <script src="/bg/js/audio-downloader.js"></script>

View File

@ -58,13 +58,13 @@
</div></div> </div></div>
<!-- Scripts --> <!-- Scripts -->
<script src="/mixed/js/core.js"></script> <script src="/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/js/yomichan.js"></script>
<script src="/mixed/js/comm.js"></script> <script src="/js/comm/cross-frame-api.js"></script>
<script src="/mixed/js/api.js"></script> <script src="/js/comm/api.js"></script>
<script src="/mixed/js/document-focus-controller.js"></script> <script src="/js/dom/document-focus-controller.js"></script>
<script src="/mixed/js/html-template-collection.js"></script> <script src="/js/dom/html-template-collection.js"></script>
<script src="/bg/js/permissions-util.js"></script> <script src="/bg/js/permissions-util.js"></script>
<script src="/bg/js/settings/settings-controller.js"></script> <script src="/bg/js/settings/settings-controller.js"></script>
<script src="/bg/js/settings/backup-controller.js"></script> <script src="/bg/js/settings/backup-controller.js"></script>

View File

@ -1571,8 +1571,8 @@ class Display extends EventDispatcher {
}; };
await dynamicLoader.loadScripts([ await dynamicLoader.loadScripts([
'/mixed/js/text-scanner.js', '/js/language/text-scanner.js',
'/mixed/js/frame-client.js', '/js/comm/frame-client.js',
'/fg/js/popup.js', '/fg/js/popup.js',
'/fg/js/popup-proxy.js', '/fg/js/popup-proxy.js',
'/fg/js/popup-window.js', '/fg/js/popup-window.js',

View File

@ -150,7 +150,7 @@ const dynamicLoader = (() => {
try { try {
script.async = false; script.async = false;
script.src = '/mixed/js/dynamic-loader-sentinel.js'; script.src = '/js/script/dynamic-loader-sentinel.js';
parent.appendChild(script); parent.appendChild(script);
} catch (e) { } catch (e) {
yomichan.off(sentinelEventName, sentinelEventCallback); yomichan.off(sentinelEventName, sentinelEventCallback);

View File

@ -219,7 +219,7 @@ THE SOFTWARE.
</div></div> </div></div>
<!-- Scripts --> <!-- Scripts -->
<script src="/mixed/js/document-focus-controller.js"></script> <script src="/js/dom/document-focus-controller.js"></script>
<script src="/bg/js/generic-page-main.js"></script> <script src="/bg/js/generic-page-main.js"></script>

View File

@ -38,15 +38,15 @@
"file://*/*" "file://*/*"
], ],
"js": [ "js": [
"mixed/js/core.js", "js/core.js",
"mixed/js/yomichan.js", "js/yomichan.js",
"mixed/js/comm.js", "js/comm/cross-frame-api.js",
"mixed/js/api.js", "js/comm/api.js",
"mixed/js/dynamic-loader.js", "js/script/dynamic-loader.js",
"mixed/js/frame-client.js", "js/comm/frame-client.js",
"mixed/js/text-scanner.js", "js/language/text-scanner.js",
"mixed/js/document-util.js", "js/dom/document-util.js",
"mixed/js/hotkey-handler.js", "js/input/hotkey-handler.js",
"fg/js/dom-text-scanner.js", "fg/js/dom-text-scanner.js",
"fg/js/popup.js", "fg/js/popup.js",
"fg/js/text-source-range.js", "fg/js/text-source-range.js",

View File

@ -161,13 +161,13 @@
</div></div> </div></div>
<!-- Scripts --> <!-- Scripts -->
<script src="/mixed/js/core.js"></script> <script src="/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/js/yomichan.js"></script>
<script src="/mixed/js/comm.js"></script> <script src="/js/comm/cross-frame-api.js"></script>
<script src="/mixed/js/api.js"></script> <script src="/js/comm/api.js"></script>
<script src="/mixed/js/document-focus-controller.js"></script> <script src="/js/dom/document-focus-controller.js"></script>
<script src="/mixed/js/html-template-collection.js"></script> <script src="/js/dom/html-template-collection.js"></script>
<script src="/bg/js/permissions-util.js"></script> <script src="/bg/js/permissions-util.js"></script>
<script src="/bg/js/settings/permissions-toggle-controller.js"></script> <script src="/bg/js/settings/permissions-toggle-controller.js"></script>
<script src="/bg/js/settings/settings-controller.js"></script> <script src="/bg/js/settings/settings-controller.js"></script>

View File

@ -49,13 +49,13 @@
</div></div> </div></div>
<script src="/mixed/js/core.js"></script> <script src="/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/js/yomichan.js"></script>
<script src="/mixed/js/comm.js"></script> <script src="/js/comm/cross-frame-api.js"></script>
<script src="/mixed/js/api.js"></script> <script src="/js/comm/api.js"></script>
<script src="/mixed/js/display-generator.js"></script> <script src="/js/display/display-generator.js"></script>
<script src="/mixed/js/html-template-collection.js"></script> <script src="/js/dom/html-template-collection.js"></script>
<script src="/bg/js/settings/pitch-accents-preview-main.js"></script> <script src="/bg/js/settings/pitch-accents-preview-main.js"></script>

View File

@ -36,16 +36,16 @@
<script src="/lib/wanakana.min.js"></script> <script src="/lib/wanakana.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/js/yomichan.js"></script>
<script src="/mixed/js/comm.js"></script> <script src="/js/comm/cross-frame-api.js"></script>
<script src="/mixed/js/api.js"></script> <script src="/js/comm/api.js"></script>
<script src="/mixed/js/dynamic-loader.js"></script> <script src="/js/script/dynamic-loader.js"></script>
<script src="/mixed/js/frame-client.js"></script> <script src="/js/comm/frame-client.js"></script>
<script src="/mixed/js/text-scanner.js"></script> <script src="/js/language/text-scanner.js"></script>
<script src="/mixed/js/document-util.js"></script> <script src="/js/dom/document-util.js"></script>
<script src="/mixed/js/hotkey-handler.js"></script> <script src="/js/input/hotkey-handler.js"></script>
<script src="/fg/js/dom-text-scanner.js"></script> <script src="/fg/js/dom-text-scanner.js"></script>
<script src="/fg/js/popup.js"></script> <script src="/fg/js/popup.js"></script>
<script src="/fg/js/text-source-range.js"></script> <script src="/fg/js/text-source-range.js"></script>

View File

@ -89,37 +89,37 @@
<div id="popup-menus"></div> <div id="popup-menus"></div>
<!-- Scripts --> <!-- Scripts -->
<script src="/mixed/js/core.js"></script> <script src="/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/js/yomichan.js"></script>
<script src="/mixed/js/comm.js"></script> <script src="/js/comm/cross-frame-api.js"></script>
<script src="/mixed/js/api.js"></script> <script src="/js/comm/api.js"></script>
<script src="/mixed/js/japanese.js"></script> <script src="/js/language/japanese-util.js"></script>
<script src="/mixed/js/document-util.js"></script> <script src="/js/dom/document-util.js"></script>
<script src="/fg/js/dom-text-scanner.js"></script> <script src="/fg/js/dom-text-scanner.js"></script>
<script src="/fg/js/text-source-range.js"></script> <script src="/fg/js/text-source-range.js"></script>
<script src="/fg/js/text-source-element.js"></script> <script src="/fg/js/text-source-element.js"></script>
<script src="/mixed/js/audio-system.js"></script> <script src="/js/media/audio-system.js"></script>
<script src="/mixed/js/dictionary-data-util.js"></script> <script src="/js/language/dictionary-data-util.js"></script>
<script src="/mixed/js/display.js"></script> <script src="/js/display/display.js"></script>
<script src="/mixed/js/display-audio.js"></script> <script src="/js/display/display-audio.js"></script>
<script src="/mixed/js/display-generator.js"></script> <script src="/js/display/display-generator.js"></script>
<script src="/mixed/js/display-history.js"></script> <script src="/js/display/display-history.js"></script>
<script src="/mixed/js/display-notification.js"></script> <script src="/js/display/display-notification.js"></script>
<script src="/mixed/js/display-profile-selection.js"></script> <script src="/js/display/display-profile-selection.js"></script>
<script src="/mixed/js/document-focus-controller.js"></script> <script src="/js/dom/document-focus-controller.js"></script>
<script src="/mixed/js/dynamic-loader.js"></script> <script src="/js/script/dynamic-loader.js"></script>
<script src="/mixed/js/frame-endpoint.js"></script> <script src="/js/comm/frame-endpoint.js"></script>
<script src="/mixed/js/hotkey-handler.js"></script> <script src="/js/input/hotkey-handler.js"></script>
<script src="/mixed/js/hotkey-help-controller.js"></script> <script src="/js/input/hotkey-help-controller.js"></script>
<script src="/mixed/js/hotkey-util.js"></script> <script src="/js/input/hotkey-util.js"></script>
<script src="/mixed/js/media-loader.js"></script> <script src="/js/media/media-loader.js"></script>
<script src="/mixed/js/panel-element.js"></script> <script src="/js/dom/panel-element.js"></script>
<script src="/mixed/js/popup-menu.js"></script> <script src="/js/dom/popup-menu.js"></script>
<script src="/mixed/js/scroll.js"></script> <script src="/js/dom/window-scroll.js"></script>
<script src="/mixed/js/text-scanner.js"></script> <script src="/js/language/text-scanner.js"></script>
<script src="/mixed/js/html-template-collection.js"></script> <script src="/js/dom/html-template-collection.js"></script>
<script src="/mixed/js/text-to-speech-audio.js"></script> <script src="/js/media/text-to-speech-audio.js"></script>
<script src="/bg/js/anki-note-builder.js"></script> <script src="/bg/js/anki-note-builder.js"></script>
<script src="/bg/js/template-renderer-proxy.js"></script> <script src="/bg/js/template-renderer-proxy.js"></script>

View File

@ -75,34 +75,34 @@
<!-- Scripts --> <!-- Scripts -->
<script src="/lib/wanakana.min.js"></script> <script src="/lib/wanakana.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/js/yomichan.js"></script>
<script src="/mixed/js/comm.js"></script> <script src="/js/comm/cross-frame-api.js"></script>
<script src="/mixed/js/api.js"></script> <script src="/js/comm/api.js"></script>
<script src="/mixed/js/japanese.js"></script> <script src="/js/language/japanese-util.js"></script>
<script src="/mixed/js/document-focus-controller.js"></script> <script src="/js/dom/document-focus-controller.js"></script>
<script src="/mixed/js/document-util.js"></script> <script src="/js/dom/document-util.js"></script>
<script src="/fg/js/dom-text-scanner.js"></script> <script src="/fg/js/dom-text-scanner.js"></script>
<script src="/fg/js/text-source-range.js"></script> <script src="/fg/js/text-source-range.js"></script>
<script src="/fg/js/text-source-element.js"></script> <script src="/fg/js/text-source-element.js"></script>
<script src="/mixed/js/audio-system.js"></script> <script src="/js/media/audio-system.js"></script>
<script src="/mixed/js/dictionary-data-util.js"></script> <script src="/js/language/dictionary-data-util.js"></script>
<script src="/mixed/js/display.js"></script> <script src="/js/display/display.js"></script>
<script src="/mixed/js/display-audio.js"></script> <script src="/js/display/display-audio.js"></script>
<script src="/mixed/js/display-generator.js"></script> <script src="/js/display/display-generator.js"></script>
<script src="/mixed/js/display-history.js"></script> <script src="/js/display/display-history.js"></script>
<script src="/mixed/js/display-notification.js"></script> <script src="/js/display/display-notification.js"></script>
<script src="/mixed/js/dynamic-loader.js"></script> <script src="/js/script/dynamic-loader.js"></script>
<script src="/mixed/js/hotkey-handler.js"></script> <script src="/js/input/hotkey-handler.js"></script>
<script src="/mixed/js/hotkey-help-controller.js"></script> <script src="/js/input/hotkey-help-controller.js"></script>
<script src="/mixed/js/hotkey-util.js"></script> <script src="/js/input/hotkey-util.js"></script>
<script src="/mixed/js/media-loader.js"></script> <script src="/js/media/media-loader.js"></script>
<script src="/mixed/js/popup-menu.js"></script> <script src="/js/dom/popup-menu.js"></script>
<script src="/mixed/js/scroll.js"></script> <script src="/js/dom/window-scroll.js"></script>
<script src="/mixed/js/text-scanner.js"></script> <script src="/js/language/text-scanner.js"></script>
<script src="/mixed/js/html-template-collection.js"></script> <script src="/js/dom/html-template-collection.js"></script>
<script src="/mixed/js/text-to-speech-audio.js"></script> <script src="/js/media/text-to-speech-audio.js"></script>
<script src="/bg/js/anki-note-builder.js"></script> <script src="/bg/js/anki-note-builder.js"></script>
<script src="/bg/js/template-renderer-proxy.js"></script> <script src="/bg/js/template-renderer-proxy.js"></script>

View File

@ -1278,24 +1278,24 @@
<script src="/lib/jszip.min.js"></script> <script src="/lib/jszip.min.js"></script>
<script src="/lib/wanakana.min.js"></script> <script src="/lib/wanakana.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/js/yomichan.js"></script>
<script src="/mixed/js/comm.js"></script> <script src="/js/comm/cross-frame-api.js"></script>
<script src="/mixed/js/environment.js"></script> <script src="/js/background/environment.js"></script>
<script src="/mixed/js/api.js"></script> <script src="/js/comm/api.js"></script>
<script src="/mixed/js/japanese.js"></script> <script src="/js/language/japanese-util.js"></script>
<script src="/mixed/js/audio-system.js"></script> <script src="/js/media/audio-system.js"></script>
<script src="/mixed/js/cache-map.js"></script> <script src="/js/general/cache-map.js"></script>
<script src="/mixed/js/dictionary-data-util.js"></script> <script src="/js/language/dictionary-data-util.js"></script>
<script src="/mixed/js/document-util.js"></script> <script src="/js/dom/document-util.js"></script>
<script src="/mixed/js/dom-data-binder.js"></script> <script src="/js/dom/dom-data-binder.js"></script>
<script src="/mixed/js/html-template-collection.js"></script> <script src="/js/dom/html-template-collection.js"></script>
<script src="/mixed/js/hotkey-util.js"></script> <script src="/js/input/hotkey-util.js"></script>
<script src="/mixed/js/object-property-accessor.js"></script> <script src="/js/general/object-property-accessor.js"></script>
<script src="/mixed/js/selector-observer.js"></script> <script src="/js/dom/selector-observer.js"></script>
<script src="/mixed/js/task-accumulator.js"></script> <script src="/js/general/task-accumulator.js"></script>
<script src="/mixed/js/text-to-speech-audio.js"></script> <script src="/js/media/text-to-speech-audio.js"></script>
<script src="/bg/js/anki.js"></script> <script src="/bg/js/anki.js"></script>
<script src="/bg/js/anki-note-builder.js"></script> <script src="/bg/js/anki-note-builder.js"></script>

View File

@ -3189,27 +3189,27 @@
<script src="/lib/jszip.min.js"></script> <script src="/lib/jszip.min.js"></script>
<script src="/lib/wanakana.min.js"></script> <script src="/lib/wanakana.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/js/yomichan.js"></script>
<script src="/mixed/js/comm.js"></script> <script src="/js/comm/cross-frame-api.js"></script>
<script src="/mixed/js/environment.js"></script> <script src="/js/background/environment.js"></script>
<script src="/mixed/js/api.js"></script> <script src="/js/comm/api.js"></script>
<script src="/mixed/js/japanese.js"></script> <script src="/js/language/japanese-util.js"></script>
<script src="/mixed/js/audio-system.js"></script> <script src="/js/media/audio-system.js"></script>
<script src="/mixed/js/cache-map.js"></script> <script src="/js/general/cache-map.js"></script>
<script src="/mixed/js/dictionary-data-util.js"></script> <script src="/js/language/dictionary-data-util.js"></script>
<script src="/mixed/js/document-focus-controller.js"></script> <script src="/js/dom/document-focus-controller.js"></script>
<script src="/mixed/js/document-util.js"></script> <script src="/js/dom/document-util.js"></script>
<script src="/mixed/js/dom-data-binder.js"></script> <script src="/js/dom/dom-data-binder.js"></script>
<script src="/mixed/js/hotkey-util.js"></script> <script src="/js/input/hotkey-util.js"></script>
<script src="/mixed/js/html-template-collection.js"></script> <script src="/js/dom/html-template-collection.js"></script>
<script src="/mixed/js/object-property-accessor.js"></script> <script src="/js/general/object-property-accessor.js"></script>
<script src="/mixed/js/panel-element.js"></script> <script src="/js/dom/panel-element.js"></script>
<script src="/mixed/js/popup-menu.js"></script> <script src="/js/dom/popup-menu.js"></script>
<script src="/mixed/js/selector-observer.js"></script> <script src="/js/dom/selector-observer.js"></script>
<script src="/mixed/js/task-accumulator.js"></script> <script src="/js/general/task-accumulator.js"></script>
<script src="/mixed/js/text-to-speech-audio.js"></script> <script src="/js/media/text-to-speech-audio.js"></script>
<script src="/bg/js/anki.js"></script> <script src="/bg/js/anki.js"></script>
<script src="/bg/js/anki-note-builder.js"></script> <script src="/bg/js/anki-note-builder.js"></script>

View File

@ -18,13 +18,13 @@
self.importScripts( self.importScripts(
'/lib/parse5.js', '/lib/parse5.js',
'/lib/wanakana.min.js', '/lib/wanakana.min.js',
'/mixed/js/core.js', '/js/core.js',
'/mixed/js/yomichan.js', '/js/yomichan.js',
'/mixed/js/environment.js', '/js/background/environment.js',
'/mixed/js/japanese.js', '/js/language/japanese-util.js',
'/mixed/js/cache-map.js', '/js/general/cache-map.js',
'/mixed/js/dictionary-data-util.js', '/js/language/dictionary-data-util.js',
'/mixed/js/object-property-accessor.js', '/js/general/object-property-accessor.js',
'/bg/js/anki.js', '/bg/js/anki.js',
'/bg/js/audio-downloader.js', '/bg/js/audio-downloader.js',
'/bg/js/clipboard-monitor.js', '/bg/js/clipboard-monitor.js',

View File

@ -14,8 +14,8 @@
</head> </head>
<body> <body>
<script src="/lib/handlebars.min.js"></script> <script src="/lib/handlebars.min.js"></script>
<script src="/mixed/js/dictionary-data-util.js"></script> <script src="/js/language/dictionary-data-util.js"></script>
<script src="/mixed/js/japanese.js"></script> <script src="/js/language/japanese-util.js"></script>
<script src="/bg/js/anki-note-data.js"></script> <script src="/bg/js/anki-note-data.js"></script>
<script src="/bg/js/template-renderer.js"></script> <script src="/bg/js/template-renderer.js"></script>
<script src="/bg/js/template-renderer-frame-api.js"></script> <script src="/bg/js/template-renderer-frame-api.js"></script>

View File

@ -314,22 +314,22 @@
<!-- Scripts --> <!-- Scripts -->
<script src="/lib/jszip.min.js"></script> <script src="/lib/jszip.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/js/yomichan.js"></script>
<script src="/mixed/js/comm.js"></script> <script src="/js/comm/cross-frame-api.js"></script>
<script src="/mixed/js/api.js"></script> <script src="/js/comm/api.js"></script>
<script src="/mixed/js/cache-map.js"></script> <script src="/js/general/cache-map.js"></script>
<script src="/mixed/js/document-focus-controller.js"></script> <script src="/js/dom/document-focus-controller.js"></script>
<script src="/mixed/js/document-util.js"></script> <script src="/js/dom/document-util.js"></script>
<script src="/mixed/js/dom-data-binder.js"></script> <script src="/js/dom/dom-data-binder.js"></script>
<script src="/mixed/js/hotkey-util.js"></script> <script src="/js/input/hotkey-util.js"></script>
<script src="/mixed/js/html-template-collection.js"></script> <script src="/js/dom/html-template-collection.js"></script>
<script src="/mixed/js/object-property-accessor.js"></script> <script src="/js/general/object-property-accessor.js"></script>
<script src="/mixed/js/panel-element.js"></script> <script src="/js/dom/panel-element.js"></script>
<script src="/mixed/js/popup-menu.js"></script> <script src="/js/dom/popup-menu.js"></script>
<script src="/mixed/js/selector-observer.js"></script> <script src="/js/dom/selector-observer.js"></script>
<script src="/mixed/js/task-accumulator.js"></script> <script src="/js/general/task-accumulator.js"></script>
<script src="/bg/js/database.js"></script> <script src="/bg/js/database.js"></script>
<script src="/bg/js/dictionary-database.js"></script> <script src="/bg/js/dictionary-database.js"></script>

View File

@ -21,7 +21,7 @@ const {VM} = require('../dev/vm');
const vm = new VM({console}); const vm = new VM({console});
vm.execute([ vm.execute([
'mixed/js/cache-map.js' 'js/general/cache-map.js'
]); ]);
const CacheMap = vm.get('CacheMap'); const CacheMap = vm.get('CacheMap');

View File

@ -30,7 +30,7 @@ const vm = new VM({
} }
}); });
vm.execute([ vm.execute([
'mixed/js/core.js' 'js/core.js'
]); ]);
const [DynamicProperty, deepEqual] = vm.get(['DynamicProperty', 'deepEqual']); const [DynamicProperty, deepEqual] = vm.get(['DynamicProperty', 'deepEqual']);

View File

@ -23,8 +23,8 @@ const {DatabaseVM} = require('../dev/database-vm');
const vm = new DatabaseVM(); const vm = new DatabaseVM();
vm.execute([ vm.execute([
'mixed/js/core.js', 'js/core.js',
'mixed/js/cache-map.js', 'js/general/cache-map.js',
'bg/js/json-schema.js', 'bg/js/json-schema.js',
'bg/js/media-utility.js', 'bg/js/media-utility.js',
'bg/js/dictionary-importer.js', 'bg/js/dictionary-importer.js',

View File

@ -97,7 +97,7 @@ async function testDocument1() {
'fg/js/dom-text-scanner.js', 'fg/js/dom-text-scanner.js',
'fg/js/text-source-range.js', 'fg/js/text-source-range.js',
'fg/js/text-source-element.js', 'fg/js/text-source-element.js',
'mixed/js/document-util.js' 'js/dom/document-util.js'
]); ]);
const [DOMTextScanner, TextSourceRange, TextSourceElement, DocumentUtil] = vm.get([ const [DOMTextScanner, TextSourceRange, TextSourceElement, DocumentUtil] = vm.get([
'DOMTextScanner', 'DOMTextScanner',

View File

@ -26,7 +26,7 @@ function clone(value) {
function createHotkeyUtil() { function createHotkeyUtil() {
const vm = new VM(); const vm = new VM();
vm.execute(['mixed/js/hotkey-util.js']); vm.execute(['js/input/hotkey-util.js']);
const [HotkeyUtil] = vm.get(['HotkeyUtil']); const [HotkeyUtil] = vm.get(['HotkeyUtil']);
return new HotkeyUtil(); return new HotkeyUtil();
} }

View File

@ -22,7 +22,7 @@ const {VM} = require('../dev/vm');
const vm = new VM(); const vm = new VM();
vm.execute([ vm.execute([
'lib/wanakana.min.js', 'lib/wanakana.min.js',
'mixed/js/japanese.js', 'js/language/japanese-util.js',
'bg/js/text-source-map.js' 'bg/js/text-source-map.js'
]); ]);
const [JapaneseUtil, TextSourceMap, wanakana] = vm.get(['JapaneseUtil', 'TextSourceMap', 'wanakana']); const [JapaneseUtil, TextSourceMap, wanakana] = vm.get(['JapaneseUtil', 'TextSourceMap', 'wanakana']);

View File

@ -20,7 +20,7 @@ const {testMain} = require('../dev/util');
const {VM} = require('../dev/vm'); const {VM} = require('../dev/vm');
const vm = new 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'); const ObjectPropertyAccessor = vm.get('ObjectPropertyAccessor');

View File

@ -47,8 +47,8 @@ function createVM(extDir) {
const vm = new VM({chrome, fetch}); const vm = new VM({chrome, fetch});
vm.execute([ vm.execute([
'mixed/js/core.js', 'js/core.js',
'mixed/js/cache-map.js', 'js/general/cache-map.js',
'bg/js/json-schema.js', 'bg/js/json-schema.js',
'bg/js/template-patcher.js', 'bg/js/template-patcher.js',
'bg/js/options.js' 'bg/js/options.js'

View File

@ -22,8 +22,8 @@ const {VM} = require('../dev/vm');
const vm = new VM({}); const vm = new VM({});
vm.execute([ vm.execute([
'mixed/js/core.js', 'js/core.js',
'mixed/js/cache-map.js', 'js/general/cache-map.js',
'bg/js/json-schema.js', 'bg/js/json-schema.js',
'bg/js/profile-conditions.js' 'bg/js/profile-conditions.js'
]); ]);

View File

@ -21,8 +21,8 @@ const {VM} = require('../dev/vm');
const vm = new VM(); const vm = new VM();
vm.execute([ vm.execute([
'mixed/js/core.js', 'js/core.js',
'mixed/js/cache-map.js', 'js/general/cache-map.js',
'bg/js/json-schema.js' 'bg/js/json-schema.js'
]); ]);
const JsonSchemaValidator = vm.get('JsonSchemaValidator'); const JsonSchemaValidator = vm.get('JsonSchemaValidator');

View File

@ -36,9 +36,9 @@ async function createVM() {
// Set up VM // Set up VM
const vm = new DatabaseVM(); const vm = new DatabaseVM();
vm.execute([ vm.execute([
'mixed/js/core.js', 'js/core.js',
'mixed/js/cache-map.js', 'js/general/cache-map.js',
'mixed/js/japanese.js', 'js/language/japanese-util.js',
'bg/js/json-schema.js', 'bg/js/json-schema.js',
'bg/js/media-utility.js', 'bg/js/media-utility.js',
'bg/js/dictionary-importer.js', 'bg/js/dictionary-importer.js',