alex/yomichan
1
Fork 0
Code Releases Activity

Hold down ctrl to search for kanji, fixes #13

Browse Source
This commit is contained in:
Alex Yatskov 2016-09-18 17:32:57 -07:00
parent 984b4ed0d6
commit 2a65060b73
1 changed files with 58 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,21 +41,23 @@ class Driver {
onKeyDown(e) { onKeyDown(e) {
if (this.enabled && this.lastMousePos !== null && (e.keyCode === 16 || e.charCode === 16)) { if (this.enabled && this.lastMousePos !== null && (e.keyCode === 16 || e.charCode === 16)) {
this.searchAt(this.lastMousePos); this.searchAt(this.lastMousePos, e.ctrlKey ? 'kanji' : 'terms');
} else {
this.hidePopup();
} }
} }
onMouseMove(e) { onMouseMove(e) {
this.lastMousePos = {x: e.clientX, y: e.clientY}; this.lastMousePos = {x: e.clientX, y: e.clientY};
if (this.enabled && (e.shiftKey || e.which === 2)) { if (this.enabled && (e.shiftKey || e.which === 2)) {
this.searchAt(this.lastMousePos); this.searchAt(this.lastMousePos, e.ctrlKey ? 'kanji' : 'terms');
} }
} }
onMouseDown(e) { onMouseDown(e) {
this.lastMousePos = {x: e.clientX, y: e.clientY}; this.lastMousePos = {x: e.clientX, y: e.clientY};
if (this.enabled && (e.shiftKey || e.which === 2)) { if (this.enabled && (e.shiftKey || e.which === 2)) {
this.searchAt(this.lastMousePos); this.searchAt(this.lastMousePos, e.ctrlKey ? 'kanji' : 'terms');
} else { } else {
this.hidePopup(); this.hidePopup();
} }
@ -77,26 +79,12 @@ class Driver {
} }
} }
searchAt(point) { searchTerms(textSource) {
if (this.pendingLookup) {
return;
}
const textSource = textSourceFromPoint(point);
if (textSource === null || !textSource.containsPoint(point)) {
this.hidePopup();
return;
}
if (this.lastTextSource !== null && this.lastTextSource.equals(textSource)) {
return;
}
textSource.setEndOffset(this.options.scanLength); textSource.setEndOffset(this.options.scanLength);
this.pendingLookup = true; this.pendingLookup = true;
findTerm(textSource.text()).then(({definitions, length}) => { findTerm(textSource.text()).then(({definitions, length}) => {
if (length === 0) { if (definitions.length === 0) {
this.pendingLookup = false; this.pendingLookup = false;
this.hidePopup(); this.hidePopup();
} else { } else {
@ -123,6 +111,57 @@ class Driver {
}); });
} }
searchKanji(textSource) {
textSource.setEndOffset(1);
this.pendingLookup = true;
findKanji(textSource.text()).then(definitions => {
if (definitions.length === 0) {
this.pendingLookup = false;
this.hidePopup();
} else {
definitions.forEach(definition => definition.url = window.location.href);
const sequence = ++this.sequence;
return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'kanji-list.html').then(content => {
this.definitions = definitions;
this.pendingLookup = false;
this.showPopup(textSource, content);
return canAddDefinitions(definitions, ['kanji']);
}).then(states => {
if (states !== null) {
states.forEach((state, index) => this.popup.invokeApi('setActionState', {index, state, sequence}));
}
});
}
});
}
searchAt(point, mode) {
if (this.pendingLookup) {
return;
}
const textSource = textSourceFromPoint(point);
if (textSource === null || !textSource.containsPoint(point)) {
this.hidePopup();
return;
}
if (this.lastTextSource !== null && this.lastTextSource.equals(textSource)) {
return;
}
switch (mode) {
case 'terms':
this.searchTerms(textSource);
break;
case 'kanji':
this.searchKanji(textSource);
break;
}
}
showPopup(textSource, content) { showPopup(textSource, content) {
this.popup.showNextTo(textSource.getRect(), content); this.popup.showNextTo(textSource.getRect(), content);