From bed16022e08a2877f16ae0971c0e7c4605724258 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Tue, 31 Jan 2017 21:10:20 -0800 Subject: [PATCH 01/24] fix dictionary priority visibility bug --- ext/bg/js/options-form.js | 2 ++ ext/bg/js/options.js | 16 ---------------- ext/manifest.json | 2 +- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js index 92596773..ed2826b4 100644 --- a/ext/bg/js/options-form.js +++ b/ext/bg/js/options-form.js @@ -164,6 +164,8 @@ function populateDictionaries(options) { ++dictCount; }); + updateVisibility(options); + $('.dict-enabled, .dict-priority').change(onOptionsChanged); $('.dict-delete').click(onDictionaryDelete); }).catch(error => { diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index ca2792c0..863e8916 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -98,22 +98,6 @@ function optionsVersion(options) { copy(options.anki.kanji, 'model', options, 'ankiKanjiModel'); copy(options.anki.kanji, 'fields', options, 'ankiKanjiFields'); - const fixupFields = fields => { - const fixups = { - '{expression-furigana}': '{furigana}', - '{glossary-list}': '{glossary}' - }; - - for (const name in fields) { - for (const fixup in fixups) { - fields[name] = fields[name].replace(fixup, fixups[fixup]); - } - } - }; - - fixupFields(options.anki.terms.fields); - fixupFields(options.anki.kanji.fields); - for (const title in options.dictionaries) { const dictionary = options.dictionaries[title]; dictionary.enabled = dictionary.enableTerms || dictionary.enableKanji; diff --git a/ext/manifest.json b/ext/manifest.json index 2ac61690..2b2a4617 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Yomichan", - "version": "1.0.6", + "version": "1.0.7", "description": "Japanese dictionary with Anki integration", "icons": {"16": "img/icon16.png", "48": "img/icon48.png", "128": "img/icon128.png"}, From a13c32a784ec41c9e46d841c14e790ffa4ab7466 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Tue, 31 Jan 2017 21:27:38 -0800 Subject: [PATCH 02/24] updating libraries --- ext/bg/guide.html | 4 +- ext/bg/legal.html | 4 +- ext/bg/options.html | 8 +- ext/fg/frame.html | 2 +- ext/fg/ttf/kanji-stroke-orders.ttf | Bin 17944324 -> 17999116 bytes .../css/bootstrap.min.css | 6 - .../bootstrap-3.3.6-dist/js/bootstrap.min.js | 7 - .../css/bootstrap-theme.css | 587 ++ .../css/bootstrap-theme.css.map | 1 + .../css/bootstrap-theme.min.css | 4 +- .../css/bootstrap-theme.min.css.map | 1 + .../bootstrap-3.3.7-dist/css/bootstrap.css | 6757 +++++++++++++++++ .../css/bootstrap.css.map | 1 + .../css/bootstrap.min.css | 6 + .../css/bootstrap.min.css.map | 1 + .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin ext/lib/bootstrap-3.3.7-dist/js/bootstrap.js | 2377 ++++++ .../bootstrap-3.3.7-dist/js/bootstrap.min.js | 7 + ext/lib/bootstrap-3.3.7-dist/js/npm.js | 13 + ext/lib/dexie.min.js | 5 +- ext/lib/handlebars.min.js | 66 +- ext/lib/jquery-2.2.2.min.js | 4 - ext/lib/jquery-3.1.1.min.js | 4 + 27 files changed, 9828 insertions(+), 37 deletions(-) delete mode 100644 ext/lib/bootstrap-3.3.6-dist/css/bootstrap.min.css delete mode 100644 ext/lib/bootstrap-3.3.6-dist/js/bootstrap.min.js create mode 100644 ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css create mode 100644 ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map rename ext/lib/{bootstrap-3.3.6-dist => bootstrap-3.3.7-dist}/css/bootstrap-theme.min.css (99%) create mode 100644 ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map create mode 100644 ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css create mode 100644 ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map create mode 100644 ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css create mode 100644 ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map rename ext/lib/{bootstrap-3.3.6-dist => bootstrap-3.3.7-dist}/fonts/glyphicons-halflings-regular.eot (100%) rename ext/lib/{bootstrap-3.3.6-dist => bootstrap-3.3.7-dist}/fonts/glyphicons-halflings-regular.svg (100%) rename ext/lib/{bootstrap-3.3.6-dist => bootstrap-3.3.7-dist}/fonts/glyphicons-halflings-regular.ttf (100%) rename ext/lib/{bootstrap-3.3.6-dist => bootstrap-3.3.7-dist}/fonts/glyphicons-halflings-regular.woff (100%) rename ext/lib/{bootstrap-3.3.6-dist => bootstrap-3.3.7-dist}/fonts/glyphicons-halflings-regular.woff2 (100%) create mode 100644 ext/lib/bootstrap-3.3.7-dist/js/bootstrap.js create mode 100644 ext/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js create mode 100644 ext/lib/bootstrap-3.3.7-dist/js/npm.js delete mode 100644 ext/lib/jquery-2.2.2.min.js create mode 100644 ext/lib/jquery-3.1.1.min.js diff --git a/ext/bg/guide.html b/ext/bg/guide.html index 23704934..344a84ae 100644 --- a/ext/bg/guide.html +++ b/ext/bg/guide.html @@ -3,8 +3,8 @@ Welcome to Yomichan! - - + +
diff --git a/ext/bg/legal.html b/ext/bg/legal.html index 16b32578..9be89f72 100644 --- a/ext/bg/legal.html +++ b/ext/bg/legal.html @@ -3,8 +3,8 @@ Yomichan Legal - - + +
diff --git a/ext/bg/options.html b/ext/bg/options.html index bef053d0..145f97fd 100644 --- a/ext/bg/options.html +++ b/ext/bg/options.html @@ -3,8 +3,8 @@ Yomichan Options - - + +