Release version 2.12

Fix options page on some browsers

Author: null-dev

background.js

@@ -314,11 +314,6 @@ let historyProcessor;
 
 let opt; //Master options variable
 
-//Get proper storage mechanism
-function storage() {
-	return chrome.storage.sync || chrome.storage.local;
-}
-
 //Load settings
 function loadSettings() {
 	storage().get(DEFAULT_OPTIONS(), function(items) {

manifest.json

@@ -9,7 +9,7 @@
 	"short_name": "DynamicHistory",
 	"author": "nulldev",
 	"description": "Automagically delete history based on the keywords on the page!",
-	"version": "2.11",
+	"version": "2.12",
 	"options_ui": {
 		"page": "options.html",
 		"chrome_style": true,

options.js

@@ -12,12 +12,6 @@
  * Core JS for Settings
  */
 
-//Get proper storage mechanism
-function storage() {
-	//Attempt to use synced storage, otherwise fallback to local storage
-	return chrome.storage.sync || chrome.storage.local;
-}
-
 //Load settings
 function loadSettings(callback) {
 	storage().get(DEFAULT_OPTIONS(), function(items) {
@@ -230,7 +224,7 @@ jQuery(document).ready(function () {
 	$("#clear_modal .close").click(hideModal);
 	$("#clear_no_btn").click(hideModal);
 	$("#clear_yes_btn").click(function() {
-		chrome.storage.sync.clear(function() {
+		storage().clear(function() {
 			loadSettings();
 		});
 		hideModal();

shared.js

@@ -42,3 +42,56 @@ function DEFAULT_OPTIONS() {
 		jsCode: ''
 	};
 }
+
+//Get proper storage mechanism
+function storage() {
+	// Reliable storage shim
+	return {
+		get: function(def, callback) {
+			// Always try sync storage first
+			if(chrome.storage.sync != null) {
+				chrome.storage.sync.get(def, function(items) {
+					if(items != null) {
+						// Sync storage works! Use sync storage items!
+						callback(items);
+					} else {
+						// Sync storage not available
+						// use local
+						chrome.storage.local.get(def, callback);
+					}
+				});
+			} else {
+				// Sync storage not enabled so only choice is local
+				chrome.storage.local.get(def, callback);
+			}
+		},
+		set: function(contents, callback) {
+			// Set both storages (cannot reliably detect which is available)
+			if(chrome.storage.sync != null) {
+				// Set sync first (callback will still be called even
+				// if sync is disabled)
+				chrome.storage.sync.set(contents, function() {
+					// Done setting sync, set local
+					chrome.storage.local.set(contents, callback);
+				});
+			} else {
+				// Sync not enabled, only set local
+				chrome.storage.local.set(contents, callback);
+			}
+		},
+		clear: function(callback) {
+			// Clear both storages (cannot reliably detect which is available)
+			if(chrome.storage.sync != null) {
+				// Clear sync first (callback will still be called even
+				// if sync is disabled)
+				chrome.storage.sync.clear(function() {
+					// Done clearing sync, clear local
+					chrome.storage.local.clear(callback);
+				});
+			} else {
+				// Sync not enabled, only clear local
+				chrome.storage.local.clear(callback);
+			}
+		}
+	};
+}