From ac012b26b37f6c01a80c1faa98fbe43913e47b6e Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Thu, 24 Mar 2016 20:30:18 -0700 Subject: File reorg and cleanup --- ext/api.js | 22 ++++++++++++++++++++++ ext/background.html | 2 +- ext/jp/api.js | 39 +++++++++++++++++++++++++++++++++++++++ ext/jp/init.js | 41 ----------------------------------------- ext/manifest.json | 5 ++--- ext/util.js | 22 ---------------------- 6 files changed, 64 insertions(+), 67 deletions(-) create mode 100644 ext/api.js create mode 100644 ext/jp/api.js delete mode 100644 ext/jp/init.js delete mode 100644 ext/util.js diff --git a/ext/api.js b/ext/api.js new file mode 100644 index 00000000..0b92cde0 --- /dev/null +++ b/ext/api.js @@ -0,0 +1,22 @@ +/* + * 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 findTerm(text, callback) { + window.chrome.runtime.sendMessage({action: 'define', text: text}, callback); +} diff --git a/ext/background.html b/ext/background.html index f0d06216..09a21779 100644 --- a/ext/background.html +++ b/ext/background.html @@ -5,6 +5,6 @@ - + diff --git a/ext/jp/api.js b/ext/jp/api.js new file mode 100644 index 00000000..3f15056a --- /dev/null +++ b/ext/jp/api.js @@ -0,0 +1,39 @@ +/* + * 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 onMessage(request, sender, callback) { + switch (request.action.toLowerCase()) { + case 'define': + callback(window.trans.findTerm(request.text)); + break; + } +} + +(() => { + const res = { + rules: 'jp/data/rules.json', + edict: 'jp/data/edict.json', + enamdict: 'jp/data/enamdict.json', + kanjidic: 'jp/data/kanjidic.json' + }; + + window.trans = new Translator(res, function() { + chrome.runtime.onMessage.addListener(onMessage); + }); +})(); diff --git a/ext/jp/init.js b/ext/jp/init.js deleted file mode 100644 index 56ec8b34..00000000 --- a/ext/jp/init.js +++ /dev/null @@ -1,41 +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 onInit() { - const test = trans.findTerm('食べられない'); - chrome.runtime.onMessage.addListener(onMessage); -} - -const res = { - rules: 'jp/data/rules.json', - edict: 'jp/data/edict.json', - enamdict: 'jp/data/enamdict.json', - kanjidic: 'jp/data/kanjidic.json' -}; - -window.trans = new Translator(res, onInit); - -function onMessage(request, sender, callback) { - switch (request.action.toLowerCase()) { - case 'define': - callback(window.trans.findTerm(request.text)); - break; - } -} - diff --git a/ext/manifest.json b/ext/manifest.json index c46e20af..a225faeb 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -8,8 +8,7 @@ "background": {"page": "background.html"}, "content_scripts": [{ - "matches": ["http://*/*", "https://*/*"], - "js": ["content.js", "util.js"], - "run_at": "document_end" + "matches": ["*://*/*"], + "js": ["content.js", "api.js"] }] } diff --git a/ext/util.js b/ext/util.js deleted file mode 100644 index 0b92cde0..00000000 --- a/ext/util.js +++ /dev/null @@ -1,22 +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 findTerm(text, callback) { - window.chrome.runtime.sendMessage({action: 'define', text: text}, callback); -} -- cgit v1.2.3