Support looking up definitions for buttons and inputs.

This commit is contained in:
Alex Yatskov 2016-07-23 19:06:33 -07:00
parent b2c19ab9c9
commit e062ae2063
4 changed files with 77 additions and 8 deletions

View File

@ -80,8 +80,15 @@ class Client {
textSourceFromPoint(point) { textSourceFromPoint(point) {
const element = document.elementFromPoint(point.x, point.y); const element = document.elementFromPoint(point.x, point.y);
if (element !== null && element.nodeName === 'IMG') { if (element !== null) {
switch (element.nodeName) {
case 'IMG':
return new TextSourceImage(element); return new TextSourceImage(element);
case 'INPUT':
case 'BUTTON':
case 'TEXTAREA':
return new TextSourceInput(element);
}
} }
const range = document.caretRangeFromPoint(point.x, point.y); const range = document.caretRangeFromPoint(point.x, point.y);

View File

@ -58,13 +58,15 @@ class Popup {
} }
setContent(content) { setContent(content) {
if (this.popup !== null) { if (this.popup === null) {
return;
}
const doc = this.popup.contentDocument; const doc = this.popup.contentDocument;
doc.open(); doc.open();
doc.write(content); doc.write(content);
doc.close(); doc.close();
} }
}
sendMessage(action, params, callback) { sendMessage(action, params, callback) {
if (this.popup !== null) { if (this.popup !== null) {

59
ext/fg/js/source-input.js Normal file
View File

@ -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();
}
}

View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"name": "Yomichan", "name": "Yomichan",
"version": "0.8", "version": "0.9",
"description": "Japanese dictionary with Anki integration", "description": "Japanese dictionary with Anki integration",
"icons": {"16": "img/icon16.png", "48": "img/icon48.png", "128": "img/icon128.png"}, "icons": {"16": "img/icon16.png", "48": "img/icon48.png", "128": "img/icon128.png"},
@ -14,6 +14,7 @@
"js": [ "js": [
"fg/js/source-range.js", "fg/js/source-range.js",
"fg/js/source-image.js", "fg/js/source-image.js",
"fg/js/source-input.js",
"fg/js/popup.js", "fg/js/popup.js",
"fg/js/api.js", "fg/js/api.js",
"fg/js/client.js" "fg/js/client.js"