diff options
| author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2020-06-28 11:26:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-28 11:26:43 -0400 |
| commit | 5bf805755a33f6f10fd9621f8a2bff7ba1cb7440 (patch) | |
| tree | 836df16ec300e46af16c178f0aebca20802bde7c /ext/bg | |
| parent | 51981f0c4e11548e138f8b4e57ffd8b96bdee4fe (diff) | |
Yomichan object separation (#627)
* Move "yomichan" object setup to a separate file
* Update script imports
* Align message handlers
* Rename Yomichan.prepare to Yomichan.ready
* Add new prepare function
* Improve isExtensionUrl
Diffstat (limited to 'ext/bg')
| -rw-r--r-- | ext/bg/background.html | 1 | ||||
| -rw-r--r-- | ext/bg/context.html | 1 | ||||
| -rw-r--r-- | ext/bg/js/context-main.js | 2 | ||||
| -rw-r--r-- | ext/bg/js/search-main.js | 2 | ||||
| -rw-r--r-- | ext/bg/js/settings/main.js | 2 | ||||
| -rw-r--r-- | ext/bg/search.html | 1 | ||||
| -rw-r--r-- | ext/bg/settings-popup-preview.html | 1 | ||||
| -rw-r--r-- | ext/bg/settings.html | 1 |
8 files changed, 8 insertions, 3 deletions
diff --git a/ext/bg/background.html b/ext/bg/background.html index 55380ae7..11ea002f 100644 --- a/ext/bg/background.html +++ b/ext/bg/background.html @@ -20,6 +20,7 @@ <script src="/mixed/lib/wanakana.min.js"></script> <script src="/mixed/js/core.js"></script> + <script src="/mixed/js/yomichan.js"></script> <script src="/mixed/js/environment.js"></script> <script src="/mixed/js/japanese.js"></script> diff --git a/ext/bg/context.html b/ext/bg/context.html index 1e7e6155..9ed0544f 100644 --- a/ext/bg/context.html +++ b/ext/bg/context.html @@ -47,6 +47,7 @@ </div> <script src="/mixed/js/core.js"></script> +<script src="/mixed/js/yomichan.js"></script> <script src="/mixed/js/comm.js"></script> <script src="/mixed/js/dom.js"></script> <script src="/mixed/js/api.js"></script> diff --git a/ext/bg/js/context-main.js b/ext/bg/js/context-main.js index 4a2ea168..8718f583 100644 --- a/ext/bg/js/context-main.js +++ b/ext/bg/js/context-main.js @@ -51,7 +51,7 @@ function setupButtonEvents(selector, command, url) { async function mainInner() { api.forwardLogsToBackend(); - await yomichan.prepare(); + await yomichan.ready(); await api.logIndicatorClear(); diff --git a/ext/bg/js/search-main.js b/ext/bg/js/search-main.js index 13bd8767..bbe6c343 100644 --- a/ext/bg/js/search-main.js +++ b/ext/bg/js/search-main.js @@ -23,7 +23,7 @@ (async () => { try { api.forwardLogsToBackend(); - await yomichan.prepare(); + await yomichan.ready(); const displaySearch = new DisplaySearch(); await displaySearch.prepare(); diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js index e22c5e53..48b72735 100644 --- a/ext/bg/js/settings/main.js +++ b/ext/bg/js/settings/main.js @@ -64,7 +64,7 @@ async function setupEnvironmentInfo() { (async () => { api.forwardLogsToBackend(); - await yomichan.prepare(); + await yomichan.ready(); setupEnvironmentInfo(); showExtensionInformation(); diff --git a/ext/bg/search.html b/ext/bg/search.html index 4a28dd88..cfcf1f96 100644 --- a/ext/bg/search.html +++ b/ext/bg/search.html @@ -71,6 +71,7 @@ <script src="/mixed/lib/wanakana.min.js"></script> <script src="/mixed/js/core.js"></script> + <script src="/mixed/js/yomichan.js"></script> <script src="/mixed/js/comm.js"></script> <script src="/mixed/js/dom.js"></script> <script src="/mixed/js/api.js"></script> diff --git a/ext/bg/settings-popup-preview.html b/ext/bg/settings-popup-preview.html index 75bf06c8..c0c8e3b9 100644 --- a/ext/bg/settings-popup-preview.html +++ b/ext/bg/settings-popup-preview.html @@ -119,6 +119,7 @@ </div></div></div> <script src="/mixed/js/core.js"></script> + <script src="/mixed/js/yomichan.js"></script> <script src="/mixed/js/comm.js"></script> <script src="/mixed/js/dom.js"></script> <script src="/mixed/js/api.js"></script> diff --git a/ext/bg/settings.html b/ext/bg/settings.html index 51cb14e7..6fa54e23 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -1133,6 +1133,7 @@ <script src="/mixed/lib/wanakana.min.js"></script> <script src="/mixed/js/core.js"></script> + <script src="/mixed/js/yomichan.js"></script> <script src="/mixed/js/comm.js"></script> <script src="/mixed/js/dom.js"></script> <script src="/mixed/js/environment.js"></script> |