aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-03-11 08:24:21 -0800
committerAlex Yatskov <alex@foosoft.net>2017-03-11 08:24:21 -0800
commita8c6fc01b8b3411172c367914e1f3c3e05bfc8c3 (patch)
tree3035381a68bb3b88b2158437035a4eae05f08f3a
parent5150cdbf72421f6c37f27d93fb8965dc38bea625 (diff)
parent86583defb021cf986726cd23d65ec0066297c1e1 (diff)
Merge branch 'dannyperson-romaji-search' into dev
-rw-r--r--ext/bg/js/display-window.js1
-rw-r--r--ext/bg/search.html1
2 files changed, 2 insertions, 0 deletions
diff --git a/ext/bg/js/display-window.js b/ext/bg/js/display-window.js
index c3890721..ad193c5b 100644
--- a/ext/bg/js/display-window.js
+++ b/ext/bg/js/display-window.js
@@ -21,6 +21,7 @@ window.displayWindow = new class extends Display {
constructor() {
super($('#spinner'), $('#content'));
$('#search').click(this.onSearch.bind(this));
+ window.wanakana.bind($('#query').get(0));
}
definitionAdd(definition, mode) {
diff --git a/ext/bg/search.html b/ext/bg/search.html
index adeb9373..e9c25e15 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -35,6 +35,7 @@
<script src="/mixed/lib/jquery-3.1.1.min.js"></script>
<script src="/bg/js/util.js"></script>
<script src="/mixed/js/display.js"></script>
+ <script src="/mixed/lib/wanakana.min.js"></script>
<script src="/bg/js/display-window.js"></script>
</body>
</html>