Merge pull request #49 from snowsunny/bugfix

Bugfix
snowsunny · Oct 5, 2020 · b53b338 · b53b338
2 parents e90058e + e0216fd
commit b53b338
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/novels-reader-crx/background.js b/novels-reader-crx/background.js
diff --git a/novels-reader-crx/content.js b/novels-reader-crx/content.js
diff --git a/novels-reader-crx/options.js b/novels-reader-crx/options.js
diff --git a/src/js/DictionariesManager.js b/src/js/DictionariesManager.js
@@ -1,4 +1,5 @@
 import _assign from 'lodash/assign'
+import _merge from 'lodash/merge'
 import _find from 'lodash/find'
 import localForage from 'localforage'
 
@@ -14,11 +15,16 @@ export default class DictionariesManager {
   async saveDictionary(newDictionary, forceFlag) {
     let storageDictionary = this.getDictionary({id: newDictionary.id, domain: newDictionary.domain})
     if(storageDictionary) {
-      if(!forceFlag && storageDictionary.raw && newDictionary.raw) {
-        let newRubies = this.getNewRubiesOnly(newDictionary, storageDictionary)
-        newDictionary.raw = newRubies.length
-          ? storageDictionary.raw + `\n${this.getDictionaryText(newRubies)}`
-          : storageDictionary.raw
+      if(!forceFlag) {
+        if(newDictionary.raw) {
+          let newline = storageDictionary.raw ? '\n' : ''
+          let newRubies = this.getNewRubiesOnly(newDictionary, storageDictionary)
+          newDictionary.raw = newRubies.length ?
+            storageDictionary.raw + newline + this.getDictionaryText(newRubies) :
+            storageDictionary.raw
+        } else {
+          newDictionary.raw = storageDictionary.raw
+        }
       }
     } else {
       newDictionary.raw = newDictionary.raw || ''