Merge branch 'dannyperson-romaji-search' into dev

This commit is contained in:
Alex Yatskov 2017-03-11 08:24:21 -08:00
commit a8c6fc01b8
2 changed files with 2 additions and 0 deletions

View File

@ -21,6 +21,7 @@ window.displayWindow = new class extends Display {
constructor() { constructor() {
super($('#spinner'), $('#content')); super($('#spinner'), $('#content'));
$('#search').click(this.onSearch.bind(this)); $('#search').click(this.onSearch.bind(this));
window.wanakana.bind($('#query').get(0));
} }
definitionAdd(definition, mode) { definitionAdd(definition, mode) {

View File

@ -35,6 +35,7 @@
<script src="/mixed/lib/jquery-3.1.1.min.js"></script> <script src="/mixed/lib/jquery-3.1.1.min.js"></script>
<script src="/bg/js/util.js"></script> <script src="/bg/js/util.js"></script>
<script src="/mixed/js/display.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> <script src="/bg/js/display-window.js"></script>
</body> </body>
</html> </html>