diff options
| -rw-r--r-- | ext/fg/js/client.js | 11 | ||||
| -rw-r--r-- | ext/fg/js/popup.js | 12 | ||||
| -rw-r--r-- | ext/fg/js/source-input.js | 59 | ||||
| -rw-r--r-- | ext/manifest.json | 3 |
4 files changed, 77 insertions, 8 deletions
diff --git a/ext/fg/js/client.js b/ext/fg/js/client.js index 37377984..bb0d3749 100644 --- a/ext/fg/js/client.js +++ b/ext/fg/js/client.js @@ -80,8 +80,15 @@ class Client { textSourceFromPoint(point) { const element = document.elementFromPoint(point.x, point.y); - if (element !== null && element.nodeName === 'IMG') { - return new TextSourceImage(element); + if (element !== null) { + switch (element.nodeName) { + case 'IMG': + return new TextSourceImage(element); + case 'INPUT': + case 'BUTTON': + case 'TEXTAREA': + return new TextSourceInput(element); + } } const range = document.caretRangeFromPoint(point.x, point.y); diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js index 11b25d8f..78106319 100644 --- a/ext/fg/js/popup.js +++ b/ext/fg/js/popup.js @@ -58,12 +58,14 @@ class Popup { } setContent(content) { - if (this.popup !== null) { - const doc = this.popup.contentDocument; - doc.open(); - doc.write(content); - doc.close(); + if (this.popup === null) { + return; } + + const doc = this.popup.contentDocument; + doc.open(); + doc.write(content); + doc.close(); } sendMessage(action, params, callback) { diff --git a/ext/fg/js/source-input.js b/ext/fg/js/source-input.js new file mode 100644 index 00000000..0bea977b --- /dev/null +++ b/ext/fg/js/source-input.js @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2016 Alex Yatskov <alex@foosoft.net> + * Author: Alex Yatskov <alex@foosoft.net> + * + * 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 <http://www.gnu.org/licenses/>. + */ + + +class TextSourceInput { + constructor(input) { + this.input = input; + this.length = -1; + } + + text() { + const text = this.textRaw(); + return this.length < 0 ? text : text.substring(0, this.length); + } + + textRaw() { + return this.input.nodeName === 'BUTTON' ? this.input.innerHTML : this.input.value; + } + + setLength(length) { + this.length = length; + } + + containsPoint(point) { + const rect = this.getRect(); + return point.x >= rect.left && point.x <= rect.right; + } + + getRect() { + return this.input.getBoundingClientRect(); + } + + select() { + // NOP + } + + deselect() { + // NOP + } + + equals(other) { + return other.input && other.textRaw() == this.textRaw(); + } +} diff --git a/ext/manifest.json b/ext/manifest.json index ac660e5b..27d67acf 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Yomichan", - "version": "0.8", + "version": "0.9", "description": "Japanese dictionary with Anki integration", "icons": {"16": "img/icon16.png", "48": "img/icon48.png", "128": "img/icon128.png"}, @@ -14,6 +14,7 @@ "js": [ "fg/js/source-range.js", "fg/js/source-image.js", + "fg/js/source-input.js", "fg/js/popup.js", "fg/js/api.js", "fg/js/client.js" |