alex/yomichan
1
Fork 0
Code Releases Activity

wip

Browse Source
This commit is contained in:
Alex Yatskov 2017-03-27 22:48:50 -07:00
parent 3b0aa88de1
commit 9de0d34af3
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/fg/js/driver.js
View File

@ -168,13 +168,13 @@ window.driver = new class {
} else { } else {
textSource.setEndOffset(length); textSource.setEndOffset(length);
const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt); const cloze = docClozeExtract(textSource, this.options.anki.sentenceExt);
const url = window.location.href; const url = window.location.href;
this.popup.showTermDefs( this.popup.showTermDefs(
textSource.getRect(), textSource.getRect(),
definitions, definitions,
this.options, this.options,
{sentence, url} {cloze, url}
); );
this.lastTextSource = textSource; this.lastTextSource = textSource;
@ -194,13 +194,13 @@ window.driver = new class {
if (definitions.length === 0) { if (definitions.length === 0) {
return false; return false;
} else { } else {
const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt); const cloze = docClozeExtract(textSource, this.options.anki.sentenceExt);
const url = window.location.href; const url = window.location.href;
this.popup.showKanjiDefs( this.popup.showKanjiDefs(
textSource.getRect(), textSource.getRect(),
definitions, definitions,
this.options, this.options,
{sentence, url} {cloze, url}
); );
this.lastTextSource = textSource; this.lastTextSource = textSource;

18
ext/fg/js/util.js
View File

@ -152,7 +152,7 @@ function docRangeFromPoint(point, imposter) {
return null; return null;
} }
function docSentenceExtract(source, extent) { function docClozeExtract(source, extent) {
const quotesFwd = {'「': '」', '『': '』', "'": "'", '"': '"'}; const quotesFwd = {'「': '」', '『': '』', "'": "'", '"': '"'};
const quotesBwd = {'」': '「', '』': '『', "'": "'", '"': '"'}; const quotesBwd = {'」': '「', '』': '『', "'": "'", '"': '"'};
const terminators = '…。．.？?！!'; const terminators = '…。．.？?！!';
@ -182,8 +182,8 @@ function docSentenceExtract(source, extent) {
quoteStack = []; quoteStack = [];
let endPos = content.length; let endPos = content.length - 1;
for (let i = position; i < endPos; ++i) { for (let i = position; i <= endPos; ++i) {
const c = content[i]; const c = content[i];
if (quoteStack.length === 0) { if (quoteStack.length === 0) {
@ -204,5 +204,15 @@ function docSentenceExtract(source, extent) {
} }
} }
return content.substring(startPos, endPos).trim(); const sentence = content.substring(startPos, endPos);
const clozePrefix = sentence.substring(0, position - startPos);
const clozeBody = source.text();
const clozeSuffix = sentence.substring(position - startPos + clozeBody.length);
return {
sentence: sentence.trim(),
prefix: clozePrefix.trim(),
body: clozeBody.trim(),
sufix: clozeSuffix.trim()
};
} }