From 53b63e8ddcdfdb81990a0f406c92f2d3188e707d Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Wed, 6 Apr 2016 20:50:12 -0700 Subject: File reorg --- ext/css/client.css | 51 ------------------ ext/fg/css/client.css | 51 ++++++++++++++++++ ext/fg/js/api.js | 42 +++++++++++++++ ext/fg/js/client.js | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++ ext/fg/js/util.js | 70 +++++++++++++++++++++++++ ext/js/api.js | 42 --------------- ext/js/client.js | 140 -------------------------------------------------- ext/js/util.js | 70 ------------------------- ext/manifest.json | 6 +-- 9 files changed, 306 insertions(+), 306 deletions(-) delete mode 100644 ext/css/client.css create mode 100644 ext/fg/css/client.css create mode 100644 ext/fg/js/api.js create mode 100644 ext/fg/js/client.js create mode 100644 ext/fg/js/util.js delete mode 100644 ext/js/api.js delete mode 100644 ext/js/client.js delete mode 100644 ext/js/util.js (limited to 'ext') diff --git a/ext/css/client.css b/ext/css/client.css deleted file mode 100644 index ce1ae9a9..00000000 --- a/ext/css/client.css +++ /dev/null @@ -1,51 +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 . - */ - -.yomichan-popup { - all: initial; - background-color: #fff; - border: 1px solid #999; - box-shadow: 0 0 10px rgba(0, 0, 0, .5); - color: #000; - font-family: sans-serif; - font-size: 12pt; - max-height: 300px; - max-width: 500px; - min-width: 200px; - overflow-y: auto; - padding: 10px; - position: fixed; - visibility: hidden; - z-index: 256; -} - -.yomichan-def-expression { - float: left; - font-family: serif; - font-size: 16pt; -} - -.yomichan-def-reading { - float: right; - font-family: serif; - font-size: 16pt; -} - -.yomichan-def-glossary { - clear: both; -} diff --git a/ext/fg/css/client.css b/ext/fg/css/client.css new file mode 100644 index 00000000..ce1ae9a9 --- /dev/null +++ b/ext/fg/css/client.css @@ -0,0 +1,51 @@ +/* + * 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 . + */ + +.yomichan-popup { + all: initial; + background-color: #fff; + border: 1px solid #999; + box-shadow: 0 0 10px rgba(0, 0, 0, .5); + color: #000; + font-family: sans-serif; + font-size: 12pt; + max-height: 300px; + max-width: 500px; + min-width: 200px; + overflow-y: auto; + padding: 10px; + position: fixed; + visibility: hidden; + z-index: 256; +} + +.yomichan-def-expression { + float: left; + font-family: serif; + font-size: 16pt; +} + +.yomichan-def-reading { + float: right; + font-family: serif; + font-size: 16pt; +} + +.yomichan-def-glossary { + clear: both; +} diff --git a/ext/fg/js/api.js b/ext/fg/js/api.js new file mode 100644 index 00000000..c65b1702 --- /dev/null +++ b/ext/fg/js/api.js @@ -0,0 +1,42 @@ +/* + * 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 . + */ + + +function sendMessage(action, data, callback) { + chrome.runtime.sendMessage({action: action, data: data}, callback); +} + +function findTerm(text, callback) { + sendMessage('findTerm', {text: text}, callback); +} + +function findKanji(text, callback) { + sendMessage('findKanji', {text: text}, callback); +} + +function renderText(data, template, callback) { + sendMessage('renderText', {data: data, template: template}, callback); +} + +function getOptions(callback) { + sendMessage('getOptions', null, callback); +} + +function getState(callback) { + sendMessage('getState', null, callback); +} diff --git a/ext/fg/js/client.js b/ext/fg/js/client.js new file mode 100644 index 00000000..3c75068c --- /dev/null +++ b/ext/fg/js/client.js @@ -0,0 +1,140 @@ +/* + * 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 . + */ + + +class Client { + constructor() { + this.popupOffset = 10; + this.lastMosePos = null; + this.enabled = false; + this.options = null; + + this.popup = document.createElement('div'); + this.popup.classList.add('yomichan-popup'); + this.popup.addEventListener('mousedown', (e) => e.stopPropagation()); + this.popup.addEventListener('scroll', (e) => e.stopPropagation()); + document.body.appendChild(this.popup); + + chrome.runtime.onMessage.addListener(this.onMessage.bind(this)); + window.addEventListener('mousedown', this.onMouseDown.bind(this)); + window.addEventListener('mousemove', this.onMouseMove.bind(this)); + window.addEventListener('keydown', this.onKeyDown.bind(this)); + window.addEventListener('scroll', (e) => this.hidePopup()); + window.addEventListener('resize', (e) => this.hidePopup()); + + getOptions((opts) => { + this.setOptions(opts); + getState((state) => { + this.setEnabled(state === 'enabled'); + }); + }); + } + + onKeyDown(e) { + if (this.enabled && this.lastMousePos !== null && (e.keyCode === 16 || e.charCode === 16)) { + this.searchAtPoint(this.lastMousePos); + } + } + + onMouseMove(e) { + this.lastMousePos = {x: e.clientX, y: e.clientY}; + if (this.enabled && (e.shiftKey || e.which === 2)) { + this.searchAtPoint(this.lastMousePos); + } + } + + onMouseDown(e) { + this.lastMousePos = {x: e.clientX, y: e.clientY}; + if (this.enabled && (e.shiftKey || e.which === 2)) { + this.searchAtPoint(this.lastMousePos); + } else { + this.hidePopup(); + } + } + + onMessage({name, value}, sender, callback) { + switch (name) { + case 'state': + this.setEnabled(value === 'enabled'); + break; + case 'options': + this.setOptions(value); + break; + } + + callback(); + } + + searchAtPoint(point) { + const range = getRangeAtPoint(point, 10); + if (range === null) { + this.hidePopup(); + return; + } + + const rect = getRangePaddedRect(range); + if (point.x < rect.left || point.x > rect.right) { + this.hidePopup(); + return; + } + + findTerm(range.toString(), ({results, length}) => { + if (length === 0) { + this.hidePopup(); + } else { + range.setEnd(range.endContainer, range.startOffset + length); + renderText({defs: results}, 'defs.html', (html) => { + this.popup.innerHTML = html; + this.showPopup(range); + }); + } + }); + } + + showPopup(range) { + const selection = window.getSelection(); + selection.removeAllRanges(); + selection.addRange(range); + + const pos = getPopupPositionForRange(this.popup, range, this.popupOffset); + + this.popup.style.left = pos.x + 'px'; + this.popup.style.top = pos.y + 'px'; + this.popup.style.visibility = 'visible'; + } + + hidePopup() { + if (this.popup.style.visibility !== 'hidden') { + const selection = window.getSelection(); + selection.removeAllRanges(); + this.popup.style.visibility = 'hidden'; + } + } + + setEnabled(enabled) { + if (!(this.enabled = enabled)) { + this.hidePopup(); + } + } + + setOptions(opts) { + this.options = opts; + } +} + +window.yomiClient = new Client(); diff --git a/ext/fg/js/util.js b/ext/fg/js/util.js new file mode 100644 index 00000000..eb153e9b --- /dev/null +++ b/ext/fg/js/util.js @@ -0,0 +1,70 @@ +/* + * 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 . + */ + + +function getRangeAtPoint(point, lookAhead) { + const range = document.caretRangeFromPoint(point.x, point.y); + if (range === null) { + return null; + } + + const node = range.startContainer; + if (node.nodeType !== 3 /* TEXT_NODE */) { + return null; + } + + const offset = range.startOffset; + const length = Math.min(node.length - offset, lookAhead); + if (length === 0) { + return null; + } + + range.setEnd(node, offset + length); + return range; +} + +function getRangePaddedRect(range) { + const node = range.startContainer; + const startOffset = range.startOffset; + const endOffset = range.endOffset; + + range.setStart(node, Math.max(0, startOffset - 1)); + range.setEnd(node, Math.min(node.length, endOffset + 1)); + const rect = range.getBoundingClientRect(); + range.setStart(node, startOffset); + range.setEnd(node, endOffset); + + return rect; +} + +function getPopupPositionForRange(popup, range, offset) { + const rangeRect = range.getBoundingClientRect(); + const popupRect = popup.getBoundingClientRect(); + + let posX = rangeRect.left; + if (posX + popupRect.width >= window.innerWidth) { + posX = window.innerWidth - popupRect.width; + } + + let posY = rangeRect.bottom + offset; + if (posY + popupRect.height >= window.innerHeight) { + posY = rangeRect.top - popupRect.height - offset; + } + + return {x: posX, y: posY}; +} diff --git a/ext/js/api.js b/ext/js/api.js deleted file mode 100644 index c65b1702..00000000 --- a/ext/js/api.js +++ /dev/null @@ -1,42 +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 . - */ - - -function sendMessage(action, data, callback) { - chrome.runtime.sendMessage({action: action, data: data}, callback); -} - -function findTerm(text, callback) { - sendMessage('findTerm', {text: text}, callback); -} - -function findKanji(text, callback) { - sendMessage('findKanji', {text: text}, callback); -} - -function renderText(data, template, callback) { - sendMessage('renderText', {data: data, template: template}, callback); -} - -function getOptions(callback) { - sendMessage('getOptions', null, callback); -} - -function getState(callback) { - sendMessage('getState', null, callback); -} diff --git a/ext/js/client.js b/ext/js/client.js deleted file mode 100644 index 3c75068c..00000000 --- a/ext/js/client.js +++ /dev/null @@ -1,140 +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 . - */ - - -class Client { - constructor() { - this.popupOffset = 10; - this.lastMosePos = null; - this.enabled = false; - this.options = null; - - this.popup = document.createElement('div'); - this.popup.classList.add('yomichan-popup'); - this.popup.addEventListener('mousedown', (e) => e.stopPropagation()); - this.popup.addEventListener('scroll', (e) => e.stopPropagation()); - document.body.appendChild(this.popup); - - chrome.runtime.onMessage.addListener(this.onMessage.bind(this)); - window.addEventListener('mousedown', this.onMouseDown.bind(this)); - window.addEventListener('mousemove', this.onMouseMove.bind(this)); - window.addEventListener('keydown', this.onKeyDown.bind(this)); - window.addEventListener('scroll', (e) => this.hidePopup()); - window.addEventListener('resize', (e) => this.hidePopup()); - - getOptions((opts) => { - this.setOptions(opts); - getState((state) => { - this.setEnabled(state === 'enabled'); - }); - }); - } - - onKeyDown(e) { - if (this.enabled && this.lastMousePos !== null && (e.keyCode === 16 || e.charCode === 16)) { - this.searchAtPoint(this.lastMousePos); - } - } - - onMouseMove(e) { - this.lastMousePos = {x: e.clientX, y: e.clientY}; - if (this.enabled && (e.shiftKey || e.which === 2)) { - this.searchAtPoint(this.lastMousePos); - } - } - - onMouseDown(e) { - this.lastMousePos = {x: e.clientX, y: e.clientY}; - if (this.enabled && (e.shiftKey || e.which === 2)) { - this.searchAtPoint(this.lastMousePos); - } else { - this.hidePopup(); - } - } - - onMessage({name, value}, sender, callback) { - switch (name) { - case 'state': - this.setEnabled(value === 'enabled'); - break; - case 'options': - this.setOptions(value); - break; - } - - callback(); - } - - searchAtPoint(point) { - const range = getRangeAtPoint(point, 10); - if (range === null) { - this.hidePopup(); - return; - } - - const rect = getRangePaddedRect(range); - if (point.x < rect.left || point.x > rect.right) { - this.hidePopup(); - return; - } - - findTerm(range.toString(), ({results, length}) => { - if (length === 0) { - this.hidePopup(); - } else { - range.setEnd(range.endContainer, range.startOffset + length); - renderText({defs: results}, 'defs.html', (html) => { - this.popup.innerHTML = html; - this.showPopup(range); - }); - } - }); - } - - showPopup(range) { - const selection = window.getSelection(); - selection.removeAllRanges(); - selection.addRange(range); - - const pos = getPopupPositionForRange(this.popup, range, this.popupOffset); - - this.popup.style.left = pos.x + 'px'; - this.popup.style.top = pos.y + 'px'; - this.popup.style.visibility = 'visible'; - } - - hidePopup() { - if (this.popup.style.visibility !== 'hidden') { - const selection = window.getSelection(); - selection.removeAllRanges(); - this.popup.style.visibility = 'hidden'; - } - } - - setEnabled(enabled) { - if (!(this.enabled = enabled)) { - this.hidePopup(); - } - } - - setOptions(opts) { - this.options = opts; - } -} - -window.yomiClient = new Client(); diff --git a/ext/js/util.js b/ext/js/util.js deleted file mode 100644 index eb153e9b..00000000 --- a/ext/js/util.js +++ /dev/null @@ -1,70 +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 . - */ - - -function getRangeAtPoint(point, lookAhead) { - const range = document.caretRangeFromPoint(point.x, point.y); - if (range === null) { - return null; - } - - const node = range.startContainer; - if (node.nodeType !== 3 /* TEXT_NODE */) { - return null; - } - - const offset = range.startOffset; - const length = Math.min(node.length - offset, lookAhead); - if (length === 0) { - return null; - } - - range.setEnd(node, offset + length); - return range; -} - -function getRangePaddedRect(range) { - const node = range.startContainer; - const startOffset = range.startOffset; - const endOffset = range.endOffset; - - range.setStart(node, Math.max(0, startOffset - 1)); - range.setEnd(node, Math.min(node.length, endOffset + 1)); - const rect = range.getBoundingClientRect(); - range.setStart(node, startOffset); - range.setEnd(node, endOffset); - - return rect; -} - -function getPopupPositionForRange(popup, range, offset) { - const rangeRect = range.getBoundingClientRect(); - const popupRect = popup.getBoundingClientRect(); - - let posX = rangeRect.left; - if (posX + popupRect.width >= window.innerWidth) { - posX = window.innerWidth - popupRect.width; - } - - let posY = rangeRect.bottom + offset; - if (posY + popupRect.height >= window.innerHeight) { - posY = rangeRect.top - popupRect.height - offset; - } - - return {x: posX, y: posY}; -} diff --git a/ext/manifest.json b/ext/manifest.json index 2f1a2b58..cbe1e04a 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -7,11 +7,11 @@ "browser_action": {"default_icon": "icon.png"}, "background": {"page": "bg/background.html"}, "options_page": "bg/options.html", - "permissions": [ "storage" ], + "permissions": ["storage"], "content_scripts": [{ "matches": ["*://*/*"], - "js": ["js/api.js", "js/util.js", "js/client.js"], - "css": ["css/client.css"] + "js": ["fg/js/api.js", "fg/js/util.js", "fg/js/client.js"], + "css": ["fg/css/client.css"] }] } -- cgit v1.2.3