Merge branch 'master' into dev

This commit is contained in:
Alex Yatskov 2016-10-18 21:29:39 -07:00
commit a4a67be455
2 changed files with 3 additions and 20 deletions

View File

@ -43,25 +43,8 @@ function modelIdToFieldOptKey(id) {
function modelIdToMarkers(id) { function modelIdToMarkers(id) {
return { return {
'anki-term-model': [ 'anki-term-model': ['audio', 'expression', 'glossary', 'glossary-list', 'reading', 'sentence', 'tags', 'url'],
'audio', 'anki-kanji-model': ['character', 'glossary', 'glossary-list', 'kunyomi', 'onyomi', 'url'],
'expression',
'expression-furigana',
'glossary',
'glossary-list',
'reading',
'sentence',
'tags',
'url'
],
'anki-kanji-model': [
'character',
'glossary',
'glossary-list',
'kunyomi',
'onyomi',
'url'
],
}[id]; }[id];
} }

View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"name": "Yomichan", "name": "Yomichan",
"version": "0.993", "version": "0.994",
"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"},