aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-08-13 20:50:43 -0700
committerAlex Yatskov <alex@foosoft.net>2017-08-13 20:50:43 -0700
commita202817b987e0af82607d814f775bde26947747a (patch)
tree1035dbe2acaf395910a59f0b9cead3327e636df2
parent3ca28a93746ed0860bf19ede83e3e9bac979bfb5 (diff)
wip
-rw-r--r--ext/bg/popup.html3
-rw-r--r--ext/fg/js/display-frame.js2
-rw-r--r--ext/fg/js/frontend.js7
-rw-r--r--ext/mixed/css/frame.css2
4 files changed, 8 insertions, 6 deletions
diff --git a/ext/bg/popup.html b/ext/bg/popup.html
index 4113b008..60253d6f 100644
--- a/ext/bg/popup.html
+++ b/ext/bg/popup.html
@@ -35,8 +35,9 @@
<script src="/bg/js/api.js"></script>
<script src="/bg/js/dictionary.js"></script>
<script src="/bg/js/options.js"></script>
- <script src="/bg/js/popup.js"></script>
<script src="/mixed/js/japanese.js"></script>
<script src="/mixed/js/request.js"></script>
+
+ <script src="/bg/js/popup.js"></script>
</body>
</html>
diff --git a/ext/fg/js/display-frame.js b/ext/fg/js/display-frame.js
index 5ea376c2..e3f3e692 100644
--- a/ext/fg/js/display-frame.js
+++ b/ext/fg/js/display-frame.js
@@ -19,7 +19,7 @@
window.yomichan_frame = new class extends Display {
constructor() {
- super($('#spinner'), $('#content'));
+ super($('#spinner'), $('#definitions'));
$(window).on('message', this.onMessage.bind(this));
}
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index de5fa953..005139e6 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -17,7 +17,7 @@
*/
-window.yomichan_frontend = new class {
+class Frontend {
constructor() {
this.popup = new Popup();
this.popupTimer = null;
@@ -121,7 +121,7 @@ window.yomichan_frontend = new class {
}
onResize() {
- this.onSearchClear();
+ this.searchClear();
}
onBgMessage(action, params, sender, callback) {
@@ -255,6 +255,7 @@ window.yomichan_frontend = new class {
this.lastTextSource = null;
}
-}();
+}
+window.yomichan_frontend = new Frontend();
window.yomichan_frontend.prepare();
diff --git a/ext/mixed/css/frame.css b/ext/mixed/css/frame.css
index a0b45fa4..8b1819bd 100644
--- a/ext/mixed/css/frame.css
+++ b/ext/mixed/css/frame.css
@@ -42,7 +42,7 @@ hr {
right: 5px;
}
-#orphan {
+#error-orphaned {
display: none;
}