fix dictionary manager for none ruby dictionary with force flag

snowsunny · Oct 28, 2017 · 4848a2a · 4848a2a
1 parent 9b40560
commit 4848a2a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/narou-reader/background.js b/narou-reader/background.js
@@ -5370,8 +5370,12 @@ var DictionariesManager = function () {
         if (newDictionary.raw) {
           newDictionary.rubies = this.getRubies(newDictionary.raw);
         } else {
-          delete newDictionary.raw;
-          newDictionary.rubies = this.getRubies(storageDictionary.raw);
+          if (forceFlag) {
+            newDictionary.rubies = [];
+          } else {
+            newDictionary.rubies = this.getRubies(storageDictionary.raw);
+            delete newDictionary.raw;
+          }
         }
       } else {
         newDictionary.raw = newDictionary.raw || '';

diff --git a/narou-reader/options.js b/narou-reader/options.js
@@ -15706,8 +15706,12 @@ var DictionariesManager = function () {
         if (newDictionary.raw) {
           newDictionary.rubies = this.getRubies(newDictionary.raw);
         } else {
-          delete newDictionary.raw;
-          newDictionary.rubies = this.getRubies(storageDictionary.raw);
+          if (forceFlag) {
+            newDictionary.rubies = [];
+          } else {
+            newDictionary.rubies = this.getRubies(storageDictionary.raw);
+            delete newDictionary.raw;
+          }
         }
       } else {
         newDictionary.raw = newDictionary.raw || '';

diff --git a/src/js/DictionariesManager.js b/src/js/DictionariesManager.js
@@ -18,8 +18,12 @@ export default class DictionariesManager {
       if(newDictionary.raw) {
         newDictionary.rubies = this.getRubies(newDictionary.raw)
       } else {
-        delete newDictionary.raw
-        newDictionary.rubies = this.getRubies(storageDictionary.raw)
+        if(forceFlag) {
+          newDictionary.rubies = []
+        } else {
+          newDictionary.rubies = this.getRubies(storageDictionary.raw)
+          delete newDictionary.raw
+        }
       }
     } else {
       newDictionary.raw = newDictionary.raw || ''