alex/yomichan
1
Fork 0
Code Releases Activity

refactor mixed/js/util.js

Browse Source
This commit is contained in:
Alex Yatskov 2017-07-16 12:48:27 -07:00
parent 1ed8997240
commit 516c7f5381
5 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/bg/background.html
View File

@ -8,7 +8,7 @@
<script src="/mixed/lib/dexie.min.js"></script> <script src="/mixed/lib/dexie.min.js"></script>
<script src="/mixed/lib/wanakana.min.js"></script> <script src="/mixed/lib/wanakana.min.js"></script>
<script src="/mixed/lib/jszip.min.js"></script> <script src="/mixed/lib/jszip.min.js"></script>
<script src="/mixed/js/util.js"></script> <script src="/mixed/js/audio.js"></script>
<script src="/bg/js/templates.js"></script> <script src="/bg/js/templates.js"></script>
<script src="/bg/js/util.js"></script> <script src="/bg/js/util.js"></script>
<script src="/bg/js/anki-connect.js"></script> <script src="/bg/js/anki-connect.js"></script>

2
ext/bg/search.html
View File

@ -34,7 +34,7 @@
<script src="/mixed/lib/jquery.min.js"></script> <script src="/mixed/lib/jquery.min.js"></script>
<script src="/bg/js/util.js"></script> <script src="/bg/js/util.js"></script>
<script src="/mixed/js/util.js"></script> <script src="/mixed/js/audio.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="/mixed/lib/wanakana.min.js"></script>
<script src="/bg/js/display-window.js"></script> <script src="/bg/js/display-window.js"></script>

2
ext/fg/frame.html
View File

@ -33,7 +33,7 @@
<script src="/mixed/lib/jquery.min.js"></script> <script src="/mixed/lib/jquery.min.js"></script>
<script src="/mixed/lib/wanakana.min.js"></script> <script src="/mixed/lib/wanakana.min.js"></script>
<script src="/fg/js/util.js"></script> <script src="/fg/js/util.js"></script>
<script src="/mixed/js/util.js"></script> <script src="/mixed/js/audio.js"></script>
<script src="/mixed/js/display.js"></script> <script src="/mixed/js/display.js"></script>
<script src="/fg/js/display-frame.js"></script> <script src="/fg/js/display-frame.js"></script>
</body> </body>

19
ext/mixed/js/util.js → ext/mixed/js/audio.js
View File

@ -17,25 +17,6 @@
*/ */
/*
* Cloze
*/
function clozeBuild(sentence, source) {
const result = {
sentence: sentence.text.trim()
};
if (source) {
result.prefix = sentence.text.substring(0, sentence.offset).trim();
result.body = source.trim();
result.suffix = sentence.text.substring(sentence.offset + source.length).trim();
}
return result;
}
/* /*
* Audio * Audio
*/ */

18
ext/mixed/js/display.js
View File

@ -80,7 +80,7 @@ class Display {
if (context) { if (context) {
for (const definition of definitions) { for (const definition of definitions) {
if (context.sentence) { if (context.sentence) {
definition.cloze = clozeBuild(context.sentence, definition.source); definition.cloze = Display.clozeBuild(context.sentence, definition.source);
} }
definition.url = context.url; definition.url = context.url;
@ -119,7 +119,7 @@ class Display {
if (context) { if (context) {
for (const definition of definitions) { for (const definition of definitions) {
if (context.sentence) { if (context.sentence) {
definition.cloze = clozeBuild(context.sentence); definition.cloze = Display.clozeBuild(context.sentence);
} }
definition.url = context.url; definition.url = context.url;
@ -394,6 +394,20 @@ class Display {
}).catch(this.handleError.bind(this)).then(() => this.spinner.hide()); }).catch(this.handleError.bind(this)).then(() => this.spinner.hide());
} }
static clozeBuild(sentence, source) {
const result = {
sentence: sentence.text.trim()
};
if (source) {
result.prefix = sentence.text.substring(0, sentence.offset).trim();
result.body = source.trim();
result.suffix = sentence.text.substring(sentence.offset + source.length).trim();
}
return result;
}
static entryIndexFind(element) { static entryIndexFind(element) {
return $('.entry').index(element.closest('.entry')); return $('.entry').index(element.closest('.entry'));
} }