alex/yomichan
1
Fork 0
Code Releases Activity

Revert "Support switching between edict and enamdict"

Browse Source 
This reverts commit f079db0471.
This commit is contained in:
Alex Yatskov 2016-04-17 18:38:29 -07:00
parent 52a8e2207c
commit 5bebf3ed2c
8 changed files with 58 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ext/bg/js/dictionary.js
View File

@ -31,24 +31,35 @@ class Dictionary {
this.kanjiDicts[name] = dict; this.kanjiDicts[name] = dict;
} }
findTerm(term, dict) { findTerm(term) {
const db = this.termDicts[dict]; let results = [];
const indices = db.indices[term] || [];
return indices.map(index => { for (const name in this.termDicts) {
const [e, r, t, ...g] = db.defs[index]; const dict = this.termDicts[name];
const indices = dict.indices[term] || [];
results = results.concat(
indices.map(index => {
const [e, r, t, ...g] = dict.defs[index];
return {id: index, expression: e, reading: r, glossary: g, tags: t.split(' ')}; return {id: index, expression: e, reading: r, glossary: g, tags: t.split(' ')};
}); })
);
} }
findKanji(kanji, dict) { return results;
const def = this.termDicts[dict][kanji]; }
findKanji(kanji) {
const results = [];
for (const name in this.termDicts) {
const def = this.termDicts[name][kanji];
if (def) { if (def) {
const [c, k, o, g] = def; const [c, k, o, g] = def;
return {id: index, character: c, kunyomi: k, onyomi: o, glossary: g}; results.push({id: index, character: c, kunyomi: k, onyomi: o, glossary: g});
}
} }
return null; return results;
} }
} }

2
ext/bg/js/templates.js
View File

@ -12,7 +12,7 @@ templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c
return "<!DOCTYPE html>\n<html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\">\n <title></title>\n <link rel=\"stylesheet\" href=\"" return "<!DOCTYPE html>\n<html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\">\n <title></title>\n <link rel=\"stylesheet\" href=\""
+ container.escapeExpression(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"root","hash":{},"data":data}) : helper))) + container.escapeExpression(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"root","hash":{},"data":data}) : helper)))
+ "/css/popup.css\">\n </head>\n <body>\n <div class=\"dictionary\">\n <a href=\"javascript:setActiveDict('edict');\">単</a><a href=\"javascript:setActiveDict('enamdict')\">名</a><a href=\"javascript:setActiveDict('kanjidic');\">漢</a>\n </div>\n"; + "/css/popup.css\">\n </head>\n <body>\n <div class=\"dictionary\">\n <a href=\"javascript:selectDict('edict');\">単</a><a href=\"javascript:selectDict('enamdict')\">名</a><a href=\"javascript:selectDict('kanjidic');\">漢</a>\n </div>\n";
},"useData":true}); },"useData":true});
templates['kanji.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { templates['kanji.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;

14
ext/bg/js/translator.js
View File

@ -63,14 +63,14 @@ class Translator {
} }
} }
findTerm(text, dict) { findTerm(text) {
const groups = {}; const groups = {};
for (let i = text.length; i > 0; --i) { for (let i = text.length; i > 0; --i) {
const term = text.slice(0, i); const term = text.slice(0, i);
const dfs = this.deinflector.deinflect(term, t => { const dfs = this.deinflector.deinflect(term, t => {
const tags = []; const tags = [];
for (const d of this.dictionary.findTerm(t, dict)) { for (const d of this.dictionary.findTerm(t)) {
tags.push(d.tags); tags.push(d.tags);
} }
@ -79,7 +79,7 @@ class Translator {
if (dfs !== null) { if (dfs !== null) {
for (const df of dfs) { for (const df of dfs) {
this.processTerm(dict, groups, df.source, df.tags, df.rules, df.root); this.processTerm(groups, df.source, df.tags, df.rules, df.root);
} }
} }
} }
@ -125,13 +125,13 @@ class Translator {
return {results: results, length: length}; return {results: results, length: length};
} }
findKanji(text, dict) { findKanji(text) {
let results = []; let results = [];
const processed = {}; const processed = {};
for (const c of text) { for (const c of text) {
if (!processed.has(c)) { if (!processed.has(c)) {
results = results.concat(this.dictionary.findKanji(c, dict)); results = results.concat(this.dictionary.findKanji(c));
processed[c] = true; processed[c] = true;
} }
} }
@ -139,8 +139,8 @@ class Translator {
return results; return results;
} }
processTerm(dict, groups, source, tags, rules=[], root='') { processTerm(groups, source, tags, rules=[], root='') {
for (const entry of this.dictionary.findTerm(root, dict)) { for (const entry of this.dictionary.findTerm(root)) {
if (entry.id in groups) { if (entry.id in groups) {
continue; continue;
} }

4
ext/bg/js/yomichan.js
View File

@ -39,8 +39,8 @@ class Yomichan {
onMessage(request, sender, callback) { onMessage(request, sender, callback) {
const {action, data} = request; const {action, data} = request;
const handlers = { const handlers = {
findKanji: ({text, dict}) => this.translator.onFindKanji(text, dict), findKanji: ({text}) => this.translator.onFindKanji(text),
findTerm: ({text, dict}) => this.translator.findTerm(text, dict), findTerm: ({text}) => this.translator.findTerm(text),
getState: () => this.state, getState: () => this.state,
getOptions: () => this.options, getOptions: () => this.options,
renderText: ({data, template}) => Handlebars.templates[template](data) renderText: ({data, template}) => Handlebars.templates[template](data)

4
ext/fg/js/api.js
View File

@ -21,8 +21,8 @@ function sendMessage(action, data, callback) {
chrome.runtime.sendMessage({action: action, data: data}, callback); chrome.runtime.sendMessage({action: action, data: data}, callback);
} }
function findTerm(text, dict, callback) { function findTerm(text, callback) {
sendMessage('findTerm', {text: text, dict: dict}, callback); sendMessage('findTerm', {text: text}, callback);
} }
function findKanji(text, callback) { function findKanji(text, callback) {

32
ext/fg/js/client.js
View File

@ -19,12 +19,11 @@
class Client { class Client {
constructor() { constructor() {
this.popupMousePos = null; this.lastMosePos = null;
this.popupQuery = ''; this.popupQuery = '';
this.popupOffset = 10; this.popupOffset = 10;
this.enabled = false; this.enabled = false;
this.options = {}; this.options = null;
this.activeDict = '';
this.popup = document.createElement('iframe'); this.popup = document.createElement('iframe');
this.popup.classList.add('yomichan-popup'); this.popup.classList.add('yomichan-popup');
@ -41,29 +40,29 @@ class Client {
window.addEventListener('resize', (e) => this.hidePopup()); window.addEventListener('resize', (e) => this.hidePopup());
getOptions((opts) => { getOptions((opts) => {
this.setActiveDict('edict'); this.setDict('edict');
this.setOptions(opts); this.setOptions(opts);
getState((state) => this.setEnabled(state === 'enabled')); getState((state) => this.setEnabled(state === 'enabled'));
}); });
} }
onKeyDown(e) { onKeyDown(e) {
if (this.enabled && this.popupMousePos !== null && (e.keyCode === 16 || e.charCode === 16)) { if (this.enabled && this.lastMousePos !== null && (e.keyCode === 16 || e.charCode === 16)) {
this.searchAtPoint(this.popupMousePos); this.searchAtPoint(this.lastMousePos);
} }
} }
onMouseMove(e) { onMouseMove(e) {
this.popupMousePos = {x: e.clientX, y: e.clientY}; this.lastMousePos = {x: e.clientX, y: e.clientY};
if (this.enabled && (e.shiftKey || e.which === 2)) { if (this.enabled && (e.shiftKey || e.which === 2)) {
this.searchAtPoint(this.popupMousePos); this.searchAtPoint(this.lastMousePos);
} }
} }
onMouseDown(e) { onMouseDown(e) {
this.popupMousePos = {x: e.clientX, y: e.clientY}; this.lastMousePos = {x: e.clientX, y: e.clientY};
if (this.enabled && (e.shiftKey || e.which === 2)) { if (this.enabled && (e.shiftKey || e.which === 2)) {
this.searchAtPoint(this.popupMousePos); this.searchAtPoint(this.lastMousePos);
} else { } else {
this.hidePopup(); this.hidePopup();
} }
@ -85,8 +84,8 @@ class Client {
onFrameMessage(e) { onFrameMessage(e) {
const {action, data} = e.data; const {action, data} = e.data;
switch (action) { switch (action) {
case 'setActiveDict': case 'selectDict':
this.setActiveDict(data); this.setDict(data);
break; break;
} }
} }
@ -114,11 +113,11 @@ class Client {
return; return;
} }
findTerm(popupQuery, this.activeDict, ({results, length}) => { findTerm(popupQuery, ({results, length}) => {
if (length === 0) { if (length === 0) {
this.hidePopup(); this.hidePopup();
} else { } else {
const params = {defs: results, root: chrome.extension.getURL('fg'), activeDict: this.activeDict}; const params = {defs: results, root: chrome.extension.getURL('fg')};
renderText(params, 'term-list.html', (html) => this.showPopup(range, html, popupQuery, length)); renderText(params, 'term-list.html', (html) => this.showPopup(range, html, popupQuery, length));
} }
}); });
@ -169,8 +168,9 @@ class Client {
this.options = opts; this.options = opts;
} }
setActiveDict(activeDict) { setDict(dict) {
this.activeDict = activeDict; this.dict = dict;
alert(dict);
} }
} }

22
ext/fg/js/popup.js
View File

@ -1,22 +0,0 @@
/*
* 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/>.
*/
function setActiveDict(dict) {
parent.postMessage({action: 'setActiveDict', data: dict}, '*');
}

2
util/tmpl/header.html
View File

@ -7,5 +7,5 @@
</head> </head>
<body> <body>
<div class="dictionary"> <div class="dictionary">
<a href="javascript:setActiveDict('edict');">単</a><a href="javascript:setActiveDict('enamdict')">名</a><a href="javascript:setActiveDict('kanjidic');">漢</a> <a href="javascript:selectDict('edict');">単</a><a href="javascript:selectDict('enamdict')">名</a><a href="javascript:selectDict('kanjidic');">漢</a>
</div> </div>