alex/yomichan
1
Fork 0
Code Releases Activity

Rename textSourceLast to textSourceCurrent

Browse Source
This commit is contained in:
toasted-nutbread 2019-10-24 20:45:30 -04:00
parent be27781c15
commit e91bcf5f55
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ext/fg/js/frontend.js
View File

@ -21,7 +21,7 @@ class Frontend {
constructor(popup, ignoreNodes) { constructor(popup, ignoreNodes) {
this.popup = popup; this.popup = popup;
this.popupTimerPromise = null; this.popupTimerPromise = null;
this.textSourceLast = null; this.textSourceCurrent = null;
this.pendingLookup = false; this.pendingLookup = false;
this.options = null; this.options = null;
this.ignoreNodes = (Array.isArray(ignoreNodes) && ignoreNodes.length > 0 ? ignoreNodes.join(',') : null); this.ignoreNodes = (Array.isArray(ignoreNodes) && ignoreNodes.length > 0 ? ignoreNodes.join(',') : null);
@ -139,8 +139,8 @@ class Frontend {
} }
async onResize() { async onResize() {
if (this.textSourceLast !== null && await this.popup.isVisibleAsync()) { if (this.textSourceCurrent !== null && await this.popup.isVisibleAsync()) {
const textSource = this.textSourceLast; const textSource = this.textSourceCurrent;
this.lastShowPromise = this.popup.showContent( this.lastShowPromise = this.popup.showContent(
textSource.getRect(), textSource.getRect(),
textSource.getWritingMode() textSource.getWritingMode()
@ -321,7 +321,7 @@ class Frontend {
const textSource = docRangeFromPoint(x, y, this.options); const textSource = docRangeFromPoint(x, y, this.options);
if ( if (
textSource === null || textSource === null ||
(this.textSourceLast !== null && this.textSourceLast.equals(textSource)) (this.textSourceCurrent !== null && this.textSourceCurrent.equals(textSource))
) { ) {
return; return;
} }
@ -367,8 +367,10 @@ class Frontend {
} }
this.pendingLookup = false; this.pendingLookup = false;
this.onAfterSearch(this.textSourceLast, cause); this.onAfterSearch(this.textSourceCurrent, cause);
} }
return results !== null;
} }
showContent(textSource, focus, definitions, type) { showContent(textSource, focus, definitions, type) {
@ -381,7 +383,7 @@ class Frontend {
{definitions, context: {sentence, url, focus}} {definitions, context: {sentence, url, focus}}
); );
this.textSourceLast = textSource; this.textSourceCurrent = textSource;
if (this.options.scanning.selectText) { if (this.options.scanning.selectText) {
textSource.select(); textSource.select();
} }
@ -417,11 +419,13 @@ class Frontend {
this.popup.hide(changeFocus); this.popup.hide(changeFocus);
this.popup.clearAutoPlayTimer(); this.popup.clearAutoPlayTimer();
if (this.options.scanning.selectText && this.textSourceLast) { if (this.textSourceCurrent !== null) {
this.textSourceLast.deselect(); if (this.options.scanning.selectText) {
this.textSourceCurrent.deselect();
} }
this.textSourceLast = null; this.textSourceCurrent = null;
}
} }
getPrimaryTouch(touchList) { getPrimaryTouch(touchList) {
@ -460,7 +464,7 @@ class Frontend {
} }
else { else {
this.primaryTouchIdentifier = touch.identifier; this.primaryTouchIdentifier = touch.identifier;
this.contextMenuPreviousRange = this.textSourceLast ? this.textSourceLast.clone() : null; this.contextMenuPreviousRange = this.textSourceCurrent !== null ? this.textSourceCurrent.clone() : null;
this.contextMenuChecking = true; this.contextMenuChecking = true;
this.scrollPrevent = false; this.scrollPrevent = false;
this.setContextMenuPrevent(false, false); this.setContextMenuPrevent(false, false);