From d6c2f1cc38a2490afe79b0d8e1f24ad214ee9534 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Thu, 20 Jul 2017 21:29:27 -0700 Subject: cleanup --- ext/fg/js/driver.js | 249 -------------------------------------------------- ext/fg/js/frontend.js | 249 ++++++++++++++++++++++++++++++++++++++++++++++++++ ext/manifest.json | 2 +- 3 files changed, 250 insertions(+), 250 deletions(-) delete mode 100644 ext/fg/js/driver.js create mode 100644 ext/fg/js/frontend.js diff --git a/ext/fg/js/driver.js b/ext/fg/js/driver.js deleted file mode 100644 index b0cc4613..00000000 --- a/ext/fg/js/driver.js +++ /dev/null @@ -1,249 +0,0 @@ -/* - * Copyright (C) 2016 Alex Yatskov - * Author: Alex Yatskov - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -window.driver = new class { - constructor() { - this.popup = new Popup(); - this.popupTimer = null; - this.lastMousePos = null; - this.mouseDownLeft = false; - this.mouseDownMiddle = false; - this.lastTextSource = null; - this.pendingLookup = false; - this.options = null; - - bgOptionsGet().then(options => { - this.options = options; - window.addEventListener('mouseover', this.onMouseOver.bind(this)); - window.addEventListener('mousedown', this.onMouseDown.bind(this)); - window.addEventListener('mouseup', this.onMouseUp.bind(this)); - window.addEventListener('mousemove', this.onMouseMove.bind(this)); - window.addEventListener('resize', e => this.searchClear()); - window.addEventListener('message', this.onFrameMessage.bind(this)); - chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this)); - }).catch(this.handleError.bind(this)); - } - - popupTimerSet(callback) { - this.popupTimerClear(); - this.popupTimer = window.setTimeout(callback, this.options.scanning.delay); - } - - popupTimerClear() { - if (this.popupTimer) { - window.clearTimeout(this.popupTimer); - this.popupTimer = null; - } - } - - onMouseOver(e) { - if (e.target === this.popup.container && this.popupTimer) { - this.popupTimerClear(); - } - } - - onMouseMove(e) { - this.lastMousePos = {x: e.clientX, y: e.clientY}; - this.popupTimerClear(); - - if (!this.options.general.enable) { - return; - } - - if (this.mouseDownLeft) { - return; - } - - const mouseScan = this.mouseDownMiddle && this.options.scanning.middleMouse; - const keyScan = - this.options.scanning.modifier === 'alt' && e.altKey || - this.options.scanning.modifier === 'ctrl' && e.ctrlKey || - this.options.scanning.modifier === 'shift' && e.shiftKey || - this.options.scanning.modifier === 'none'; - - if (!keyScan && !mouseScan) { - return; - } - - const searchFunc = () => this.searchAt(this.lastMousePos); - if (this.options.scanning.modifier === 'none') { - this.popupTimerSet(searchFunc); - } else { - searchFunc(); - } - } - - onMouseDown(e) { - this.lastMousePos = {x: e.clientX, y: e.clientY}; - this.popupTimerClear(); - this.searchClear(); - - if (e.which === 1) { - this.mouseDownLeft = true; - } else if (e.which === 2) { - this.mouseDownMiddle = true; - } - } - - onMouseUp(e) { - if (e.which === 1) { - this.mouseDownLeft = false; - } else if (e.which === 2) { - this.mouseDownMiddle = false; - } - } - - onFrameMessage(e) { - const handlers = { - popupClose: () => { - this.searchClear(); - }, - - selectionCopy: () => { - document.execCommand('copy'); - } - }; - - const handler = handlers[e.data]; - if (handler) { - handler(); - } - } - - onBgMessage({action, params}, sender, callback) { - const handlers = { - optionsSet: options => { - this.options = options; - if (!this.options.enable) { - this.searchClear(); - } - } - }; - - const handler = handlers[action]; - if (handler) { - handler(params); - } - - callback(); - } - - searchAt(point) { - if (this.pendingLookup) { - return; - } - - const textSource = docRangeFromPoint(point); - if (!textSource || !textSource.containsPoint(point)) { - docImposterDestroy(); - return; - } - - if (this.lastTextSource && this.lastTextSource.equals(textSource)) { - return; - } - - this.pendingLookup = true; - this.searchTerms(textSource).then(found => { - if (!found) { - return this.searchKanji(textSource); - } - }).catch(error => { - this.handleError(error, textSource); - }).then(() => { - docImposterDestroy(); - this.pendingLookup = false; - }); - } - - searchTerms(textSource) { - textSource.setEndOffset(this.options.scanning.length); - - return bgTermsFind(textSource.text()).then(({definitions, length}) => { - if (definitions.length === 0) { - return false; - } else { - textSource.setEndOffset(length); - - const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt); - const url = window.location.href; - this.popup.showTermDefs( - textSource.getRect(), - definitions, - this.options, - {sentence, url} - ); - - this.lastTextSource = textSource; - if (this.options.scanning.selectText) { - textSource.select(); - } - - return true; - } - }); - } - - searchKanji(textSource) { - textSource.setEndOffset(1); - - return bgKanjiFind(textSource.text()).then(definitions => { - if (definitions.length === 0) { - return false; - } else { - const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt); - const url = window.location.href; - this.popup.showKanjiDefs( - textSource.getRect(), - definitions, - this.options, - {sentence, url} - ); - - this.lastTextSource = textSource; - if (this.options.scanning.selectText) { - textSource.select(); - } - - return true; - } - }); - } - - searchClear() { - docImposterDestroy(); - this.popup.hide(); - - if (this.options.scanning.selectText && this.lastTextSource) { - this.lastTextSource.deselect(); - } - - this.lastTextSource = null; - } - - handleError(error, textSource) { - if (window.orphaned) { - if (textSource && this.options.scanning.modifier !== 'none') { - this.popup.showOrphaned(textSource.getRect(), this.options); - } - } else { - window.alert(`Error: ${error}`); - } - } -}; diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js new file mode 100644 index 00000000..5a51af6d --- /dev/null +++ b/ext/fg/js/frontend.js @@ -0,0 +1,249 @@ +/* + * Copyright (C) 2016 Alex Yatskov + * Author: Alex Yatskov + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +window.frontend = new class { + constructor() { + this.popup = new Popup(); + this.popupTimer = null; + this.lastMousePos = null; + this.mouseDownLeft = false; + this.mouseDownMiddle = false; + this.lastTextSource = null; + this.pendingLookup = false; + this.options = null; + + bgOptionsGet().then(options => { + this.options = options; + window.addEventListener('mouseover', this.onMouseOver.bind(this)); + window.addEventListener('mousedown', this.onMouseDown.bind(this)); + window.addEventListener('mouseup', this.onMouseUp.bind(this)); + window.addEventListener('mousemove', this.onMouseMove.bind(this)); + window.addEventListener('resize', e => this.searchClear()); + window.addEventListener('message', this.onFrameMessage.bind(this)); + chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this)); + }).catch(this.handleError.bind(this)); + } + + popupTimerSet(callback) { + this.popupTimerClear(); + this.popupTimer = window.setTimeout(callback, this.options.scanning.delay); + } + + popupTimerClear() { + if (this.popupTimer) { + window.clearTimeout(this.popupTimer); + this.popupTimer = null; + } + } + + onMouseOver(e) { + if (e.target === this.popup.container && this.popupTimer) { + this.popupTimerClear(); + } + } + + onMouseMove(e) { + this.lastMousePos = {x: e.clientX, y: e.clientY}; + this.popupTimerClear(); + + if (!this.options.general.enable) { + return; + } + + if (this.mouseDownLeft) { + return; + } + + const mouseScan = this.mouseDownMiddle && this.options.scanning.middleMouse; + const keyScan = + this.options.scanning.modifier === 'alt' && e.altKey || + this.options.scanning.modifier === 'ctrl' && e.ctrlKey || + this.options.scanning.modifier === 'shift' && e.shiftKey || + this.options.scanning.modifier === 'none'; + + if (!keyScan && !mouseScan) { + return; + } + + const searchFunc = () => this.searchAt(this.lastMousePos); + if (this.options.scanning.modifier === 'none') { + this.popupTimerSet(searchFunc); + } else { + searchFunc(); + } + } + + onMouseDown(e) { + this.lastMousePos = {x: e.clientX, y: e.clientY}; + this.popupTimerClear(); + this.searchClear(); + + if (e.which === 1) { + this.mouseDownLeft = true; + } else if (e.which === 2) { + this.mouseDownMiddle = true; + } + } + + onMouseUp(e) { + if (e.which === 1) { + this.mouseDownLeft = false; + } else if (e.which === 2) { + this.mouseDownMiddle = false; + } + } + + onFrameMessage(e) { + const handlers = { + popupClose: () => { + this.searchClear(); + }, + + selectionCopy: () => { + document.execCommand('copy'); + } + }; + + const handler = handlers[e.data]; + if (handler) { + handler(); + } + } + + onBgMessage({action, params}, sender, callback) { + const handlers = { + optionsSet: options => { + this.options = options; + if (!this.options.enable) { + this.searchClear(); + } + } + }; + + const handler = handlers[action]; + if (handler) { + handler(params); + } + + callback(); + } + + searchAt(point) { + if (this.pendingLookup) { + return; + } + + const textSource = docRangeFromPoint(point); + if (!textSource || !textSource.containsPoint(point)) { + docImposterDestroy(); + return; + } + + if (this.lastTextSource && this.lastTextSource.equals(textSource)) { + return; + } + + this.pendingLookup = true; + this.searchTerms(textSource).then(found => { + if (!found) { + return this.searchKanji(textSource); + } + }).catch(error => { + this.handleError(error, textSource); + }).then(() => { + docImposterDestroy(); + this.pendingLookup = false; + }); + } + + searchTerms(textSource) { + textSource.setEndOffset(this.options.scanning.length); + + return bgTermsFind(textSource.text()).then(({definitions, length}) => { + if (definitions.length === 0) { + return false; + } else { + textSource.setEndOffset(length); + + const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt); + const url = window.location.href; + this.popup.showTermDefs( + textSource.getRect(), + definitions, + this.options, + {sentence, url} + ); + + this.lastTextSource = textSource; + if (this.options.scanning.selectText) { + textSource.select(); + } + + return true; + } + }); + } + + searchKanji(textSource) { + textSource.setEndOffset(1); + + return bgKanjiFind(textSource.text()).then(definitions => { + if (definitions.length === 0) { + return false; + } else { + const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt); + const url = window.location.href; + this.popup.showKanjiDefs( + textSource.getRect(), + definitions, + this.options, + {sentence, url} + ); + + this.lastTextSource = textSource; + if (this.options.scanning.selectText) { + textSource.select(); + } + + return true; + } + }); + } + + searchClear() { + docImposterDestroy(); + this.popup.hide(); + + if (this.options.scanning.selectText && this.lastTextSource) { + this.lastTextSource.deselect(); + } + + this.lastTextSource = null; + } + + handleError(error, textSource) { + if (window.orphaned) { + if (textSource && this.options.scanning.modifier !== 'none') { + this.popup.showOrphaned(textSource.getRect(), this.options); + } + } else { + window.alert(`Error: ${error}`); + } + } +}; diff --git a/ext/manifest.json b/ext/manifest.json index 7a277fb2..a318e539 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -20,7 +20,7 @@ "fg/js/source-element.js", "fg/js/background.js", "fg/js/popup.js", - "fg/js/driver.js" + "fg/js/frontend.js" ], "css": ["fg/css/client.css"] }], -- cgit v1.2.3