Sentence and URL support

This commit is contained in:
Alex Yatskov 2016-07-25 20:07:54 -07:00
parent d26ecab0b5
commit f88f8dc97f
4 changed files with 53 additions and 25 deletions

View File

@ -171,7 +171,9 @@ class Yomichan {
'kunyomi',
'onyomi',
'reading',
'sentence',
'tags',
'url',
];
for (let tag of tags) {

View File

@ -25,6 +25,7 @@ class Client {
this.lastTextSource = null;
this.activateKey = 16;
this.activateBtn = 2;
this.sentenceExtent = 200;
this.enabled = false;
this.options = {};
this.definitions = null;
@ -94,9 +95,15 @@ class Client {
if (length === 0) {
this.hidePopup();
} else {
const sequence = ++this.sequence;
textSource.setEndOffset(length);
const sentence = Client.extractSentence(textSource, this.sentenceExtent);
definitions.forEach((definition) => {
definition.url = window.location.href;
definition.sentence = sentence;
});
const sequence = ++this.sequence;
bgRenderText(
{definitions, root: this.fgRoot, options: this.options, sequence},
'term-list.html',
@ -180,6 +187,10 @@ class Client {
api_displayKanji(kanji) {
bgFindKanji(kanji, (definitions) => {
definitions.forEach((definition) => {
definition.url = window.location.href;
});
const sequence = ++this.sequence;
bgRenderText(
{definitions, root: this.fgRoot, options: this.options, sequence},
@ -219,11 +230,16 @@ class Client {
return null;
}
static extractSentence(content, position) {
static extractSentence(source, extent) {
const quotesFwd = {'「': '」', '『': '』', "'": "'", '"': '"'};
const quotesBwd = {'」': '「', '』': '『', "'": "'", '"': '"'};
const terminators = '…。..?!';
const sourceLocal = source.clone();
const position = sourceLocal.setStartOffset(extent);
sourceLocal.setEndOffset(position + extent);
const content = sourceLocal.text();
let quoteStack = [];
let startPos = 0;

View File

@ -18,9 +18,13 @@
class TextSourceInput {
constructor(input) {
constructor(input, length=-1) {
this.input = input;
this.length = -1;
this.length = length;
}
clone() {
return new TextSourceInput(this.input, this.length);
}
text() {

View File

@ -22,20 +22,26 @@ class TextSourceRange {
this.rng = range;
}
clone() {
return new TextSourceRange(this.rng.cloneRange());
}
text() {
return this.rng.toString();
}
setEndOffset(length) {
const end = TextSourceRange.seekForward(this.rng.startContainer, this.rng.startOffset + length);
this.rng.setEnd(end.node, end.offset);
return length - end.length;
const lengthAdj = length + this.rng.startOffset;
const state = TextSourceRange.seekForward(this.rng.startContainer, lengthAdj);
this.rng.setEnd(state.node, state.offset);
return length - state.length;
}
setStartOffset(length) {
const start = TextSourceRange.seekBackward(this.rng.startContainer, length + (this.rng.startContainer.length - this.rng.startOffset));
this.rng.setStart(start.node, start.offset);
return length - start.length;
const lengthAdj = length + (this.rng.startContainer.length - this.rng.startOffset);
const state = TextSourceRange.seekBackward(this.rng.startContainer, lengthAdj);
this.rng.setStart(state.node, state.offset);
return length - state.length;
}
containsPoint(point) {