diff options
| -rw-r--r-- | ext/bg/context.html (renamed from ext/bg/popup.html) | 2 | ||||
| -rw-r--r-- | ext/bg/js/context.js (renamed from ext/bg/js/popup.js) | 0 | ||||
| -rw-r--r-- | ext/bg/js/search.js (renamed from ext/bg/js/display-window.js) | 6 | ||||
| -rw-r--r-- | ext/bg/search.html | 4 | ||||
| -rw-r--r-- | ext/fg/css/client.css | 2 | ||||
| -rw-r--r-- | ext/fg/float.html (renamed from ext/fg/frame.html) | 10 | ||||
| -rw-r--r-- | ext/fg/js/float.js (renamed from ext/fg/js/display-frame.js) | 8 | ||||
| -rw-r--r-- | ext/fg/js/popup.js | 4 | ||||
| -rw-r--r-- | ext/manifest.json | 5 | ||||
| -rw-r--r-- | ext/mixed/css/display.css (renamed from ext/mixed/css/frame.css) | 0 |
10 files changed, 22 insertions, 19 deletions
diff --git a/ext/bg/popup.html b/ext/bg/context.html index 60253d6f..3828c9fe 100644 --- a/ext/bg/popup.html +++ b/ext/bg/context.html @@ -38,6 +38,6 @@ <script src="/mixed/js/japanese.js"></script> <script src="/mixed/js/request.js"></script> - <script src="/bg/js/popup.js"></script> + <script src="/bg/js/context.js"></script> </body> </html> diff --git a/ext/bg/js/popup.js b/ext/bg/js/context.js index 77cb5166..77cb5166 100644 --- a/ext/bg/js/popup.js +++ b/ext/bg/js/context.js diff --git a/ext/bg/js/display-window.js b/ext/bg/js/search.js index cbb96681..87f50c32 100644 --- a/ext/bg/js/display-window.js +++ b/ext/bg/js/search.js @@ -17,7 +17,7 @@ */ -window.yomichan_window = new class extends Display { +class DisplaySearch extends Display { constructor() { super($('#spinner'), $('#content')); @@ -51,4 +51,6 @@ window.yomichan_window = new class extends Display { this.onError(e); } } -}; +} + +window.yomichan_search = new DisplaySearch(); diff --git a/ext/bg/search.html b/ext/bg/search.html index fe44d74e..d10530f9 100644 --- a/ext/bg/search.html +++ b/ext/bg/search.html @@ -5,7 +5,7 @@ <title>Yomichan Search</title> <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css"> - <link rel="stylesheet" type="text/css" href="/mixed/css/frame.css"> + <link rel="stylesheet" type="text/css" href="/mixed/css/display.css"> </head> <body> <div class="container-fluid"> @@ -45,6 +45,6 @@ <script src="/mixed/js/display.js"></script> <script src="/mixed/js/japanese.js"></script> - <script src="/bg/js/display-window.js"></script> + <script src="/bg/js/search.js"></script> </body> </html> diff --git a/ext/fg/css/client.css b/ext/fg/css/client.css index 9f566480..b5b1f6bd 100644 --- a/ext/fg/css/client.css +++ b/ext/fg/css/client.css @@ -17,7 +17,7 @@ */ -iframe#yomichan-popup { +iframe#yomichan-float { all: initial; background-color: #fff; border: 1px solid #999; diff --git a/ext/fg/frame.html b/ext/fg/float.html index dda3ef06..a3b66c92 100644 --- a/ext/fg/frame.html +++ b/ext/fg/float.html @@ -5,7 +5,7 @@ <title></title> <link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css"> - <link rel="stylesheet" href="/mixed/css/frame.css"> + <link rel="stylesheet" href="/mixed/css/display.css"> <style type="text/css"> .entry, .note { padding-left: 10px; @@ -30,14 +30,14 @@ </div> </div> + <script src="/mixed/lib/jquery.min.js"></script> + <script src="/mixed/lib/wanakana.min.js"></script> + <script src="/fg/js/api.js"></script> - <script src="/fg/js/dictionary.js"></script> <script src="/fg/js/util.js"></script> <script src="/mixed/js/audio.js"></script> <script src="/mixed/js/display.js"></script> - <script src="/mixed/lib/jquery.min.js"></script> - <script src="/mixed/lib/wanakana.min.js"></script> - <script src="/fg/js/display-frame.js"></script> + <script src="/fg/js/float.js"></script> </body> </html> diff --git a/ext/fg/js/display-frame.js b/ext/fg/js/float.js index e3f3e692..59293239 100644 --- a/ext/fg/js/display-frame.js +++ b/ext/fg/js/float.js @@ -17,10 +17,10 @@ */ -window.yomichan_frame = new class extends Display { +class DisplayFloat extends Display { constructor() { super($('#spinner'), $('#definitions')); - $(window).on('message', this.onMessage.bind(this)); + $(window).on('message', e => this.onMessage(e)); } onError(error) { @@ -83,4 +83,6 @@ window.yomichan_frame = new class extends Display { super.onKeyDown(e); } } -}; +} + +window.yomichan_display = new DisplayFloat(); diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js index ba3289d4..8e61169a 100644 --- a/ext/fg/js/popup.js +++ b/ext/fg/js/popup.js @@ -20,10 +20,10 @@ class Popup { constructor() { this.container = document.createElement('iframe'); - this.container.id = 'yomichan-popup'; + this.container.id = 'yomichan-float'; this.container.addEventListener('mousedown', e => e.stopPropagation()); this.container.addEventListener('scroll', e => e.stopPropagation()); - this.container.setAttribute('src', chrome.extension.getURL('/fg/frame.html')); + this.container.setAttribute('src', chrome.extension.getURL('/fg/float.html')); this.container.style.width = '0px'; this.container.style.height = '0px'; this.injected = null; diff --git a/ext/manifest.json b/ext/manifest.json index ee3bd2ac..a8b68bfb 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -7,7 +7,7 @@ "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"}, "browser_action": { "default_icon": {"19": "mixed/img/icon19.png", "38": "mixed/img/icon38.png"}, - "default_popup": "bg/popup.html" + "default_popup": "bg/context.html" }, "author": "Alex Yatskov", @@ -20,7 +20,6 @@ "fg/js/popup.js", "fg/js/source.js", "fg/js/util.js", - "fg/js/frontend.js" ], "css": ["fg/css/client.css"] @@ -48,7 +47,7 @@ "description": "Open search window" } }, - "web_accessible_resources": ["fg/frame.html"], + "web_accessible_resources": ["fg/float.html"], "applications": { "gecko": { "id": "yomichan-live@foosoft.net", diff --git a/ext/mixed/css/frame.css b/ext/mixed/css/display.css index 8b1819bd..8b1819bd 100644 --- a/ext/mixed/css/frame.css +++ b/ext/mixed/css/display.css |