From a13c32a784ec41c9e46d841c14e790ffa4ab7466 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Tue, 31 Jan 2017 21:27:38 -0800 Subject: updating libraries --- ext/bg/guide.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/bg/guide.html') 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! - - + +
-- cgit v1.2.3 From 6b7e094041142b02d83ab5d11acf30565d46ee6c Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 26 Feb 2017 10:38:48 -0800 Subject: fix options versioning code, update usage guide --- ext/bg/guide.html | 7 +++---- ext/bg/js/options.js | 16 ++++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'ext/bg/guide.html') diff --git a/ext/bg/guide.html b/ext/bg/guide.html index 344a84ae..4b0835b8 100644 --- a/ext/bg/guide.html +++ b/ext/bg/guide.html @@ -23,11 +23,10 @@

    -
  1. Left-click on the icon to enable or disable Yomichan for the current browser instance.
    2. -
  2. Right-click on the icon and select Options to open the Yomichan options page.
    3. -
  3. Import any dictionaries (bundled or custom) you wish to use for Kanji and term searches; none are imported by default.
    4. +
  4. Click on the icon in the browser toolbar to open the Yomichan options page.
    5. +
  5. Import the dictionaries (bundled or custom) you wish to use for term and Kanji searches.
  6. Hold down Shift (or the middle mouse button) as you hover over text to see term definitions.
    7. -
  7. Resize the definitions window by dragging the bottom-left corner inwards or outwards to make it smaller or larger.
    8. +
  8. Click on the icon to hear the term pronounced by a native speaker (if audio is available).
  9. Click on Kanji in the definition window to view additional information about that character.
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index 127f0421..7a47c702 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -51,7 +51,7 @@ function optionsSetDefaults(options) { const combine = (target, source) => { for (const key in source) { - if (!(key in target)) { + if (!target.hasOwnProperty(key)) { target[key] = source[key]; } } @@ -69,9 +69,6 @@ function optionsSetDefaults(options) { function optionsVersion(options) { - optionsSetDefaults(options); - options.version = options.version || 0; - const fixups = [ () => { const copy = (targetDict, targetKey, sourceDict, sourceKey) => { @@ -125,10 +122,13 @@ function optionsVersion(options) { } ]; - if (options.version < fixups.length) { - fixups[options.version](); - ++options.version; - optionsVersion(options); + optionsSetDefaults(options); + if (!options.hasOwnProperty('version')) { + options.version = fixups.length; + } + + while (options.version < fixups.length) { + fixups[options.version++](); } return options; -- cgit v1.2.3