Merge pull request #19 from FlandreDaisuki/empty-storage-bug

Brawl345 · web-flow · commit 0467e9422931 · 2017-09-20T14:11:53.000+02:00
v3.1.2:
* Fix empty storage check
diff --git a/background.js b/background.js
@@ -86,11 +86,11 @@ const defaultSettings = {
 /* On startup, check whether we have stored settings and set up the context menu.
   If we don't, then store the default settings. */
 function checkStoredSettings(storedSettings) {
-	if (storedSettings.openInBackground == null || !storedSettings.openTabAt || !storedSettings.storageProviders) {
+	if (Object.getOwnPropertyNames(storedSettings).length) {
+		chrome.storage.sync.get('storageProviders', createContextMenu);
+	} else {
 		chrome.storage.sync.set(defaultSettings);
 		createContextMenu(defaultSettings.storageProviders);
-	} else {
-		chrome.storage.sync.get('storageProviders', createContextMenu);
 	}
 }
 
diff --git a/manifest.json b/manifest.json
@@ -4,7 +4,7 @@
 	"name": "__MSG_extensionName__",
 	"description": "__MSG_extensionDescription__",
 	"author": "Andreas Bielawski",
-	"version": "3.1.1",
+	"version": "3.1.2",
 	"icons": {
 		"16": "icons/16.png",
 		"32": "icons/32.png",

Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,11 @@ const defaultSettings = {`
`86`	`86`	`/* On startup, check whether we have stored settings and set up the context menu.`
`87`	`87`	`If we don't, then store the default settings. */`
`88`	`88`	`function checkStoredSettings(storedSettings) {`
`89`		`- if (storedSettings.openInBackground == null \|\| !storedSettings.openTabAt \|\| !storedSettings.storageProviders) {`
	`89`	`+ if (Object.getOwnPropertyNames(storedSettings).length) {`
	`90`	`+ chrome.storage.sync.get('storageProviders', createContextMenu);`
	`91`	`+ } else {`
`90`	`92`	`chrome.storage.sync.set(defaultSettings);`
`91`	`93`	`createContextMenu(defaultSettings.storageProviders);`
`92`		`- } else {`
`93`		`- chrome.storage.sync.get('storageProviders', createContextMenu);`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`