fix #840 (need confirmation)

platform/chromium/manifest.json

@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "uMatrix",
     "short_name": "uMatrix",
-    "version": "1.1.14",
+    "version": "1.1.16",
     "description": "__MSG_extShortDesc__",
     "icons": {
         "16": "img/icon_16.png",

platform/chromium/vapi-common.js

@@ -85,31 +85,39 @@ vAPI.closePopup = function() {
 // This storage is optional, but it is nice to have, for a more polished user
 // experience.
 
-// This can throw in some contexts (like in devtool).
-try {
-    vAPI.localStorage = self.localStorage;
-} catch (ex) {
-}
-
 // https://github.com/gorhill/uBlock/issues/2824
 //   Use a dummy localStorage if for some reasons it's not available.
-if ( vAPI.localStorage instanceof Object === false ) {
+
+// https://github.com/gorhill/uMatrix/issues/840
+//   Always use a wrapper to seamlessly handle exceptions
+
 vAPI.localStorage = {
-        length: 0,
     clear: function() {
+        try {
+            window.localStorage.clear();
+        } catch(ex) {
+        }
     },
-        getItem: function() {
+    getItem: function(key) {
+        try {
+            return window.localStorage.getItem(key);
+        } catch(ex) {
+        }
         return null;
     },
-        key: function() {
-            throw new RangeError();
-        },
-        removeItem: function() {
+    removeItem: function(key) {
+        try {
+            window.localStorage.removeItem(key);
+        } catch(ex) {
+        }
     },
-        setItem: function() {
+    setItem: function(key, value) {
+        try {
+            window.localStorage.setItem(key, value);
+        } catch(ex) {
         }
-    };
     }
+};
 
 /******************************************************************************/
 

src/js/messaging.js

@@ -489,13 +489,22 @@ var evaluateURLs = function(tabId, requests) {
     }
 
     if ( placeholders === null ) {
-        var bg = vAPI.localStorage.getItem('placeholderBackground');
         placeholders = {
-            background: bg,
-            border: vAPI.localStorage.getItem('placeholderBorder'),
-            iframe: vAPI.localStorage.getItem('placeholderDocument').replace('{{bg}}', bg),
-            img: vAPI.localStorage.getItem('placeholderImage')
-        };
+            background:
+                vAPI.localStorage.getItem('placeholderBackground') ||
+                µm.defaultLocalUserSettings.placeholderBackground,
+            border:
+                vAPI.localStorage.getItem('placeholderBorder') ||
+                µm.defaultLocalUserSettings.placeholderBorder,
+            iframe:
+                vAPI.localStorage.getItem('placeholderDocument') ||
+                µm.defaultLocalUserSettings.placeholderDocument,
+            img:
+                vAPI.localStorage.getItem('placeholderImage') ||
+                µm.defaultLocalUserSettings.placeholderImage
+        };
+        placeholders.iframe =
+            placeholders.iframe.replace('{{bg}}', placeholders.background);
     }
     response.placeholders = placeholders;
 

src/js/popup.js

@@ -35,8 +35,8 @@
 // Stuff which is good to do very early so as to avoid visual glitches.
 
 (function() {
-    var paneContentPaddingTop = localStorage.getItem('paneContentPaddingTop'),
-        touchDevice = localStorage.getItem('touchDevice');
+    var paneContentPaddingTop = vAPI.localStorage.getItem('paneContentPaddingTop'),
+        touchDevice = vAPI.localStorage.getItem('touchDevice');
 
     if ( typeof paneContentPaddingTop === 'string' ) {
         document.querySelector('.paneContent').style.setProperty(
@@ -50,7 +50,7 @@
         document.addEventListener('touchstart', function onTouched(ev) {
             document.removeEventListener(ev.type, onTouched);
             document.body.setAttribute('data-touch', 'true');
-            localStorage.setItem('touchDevice', 'true');
+            vAPI.localStorage.setItem('touchDevice', 'true');
             resizePopup();
         });
     }
@@ -71,7 +71,7 @@ var resizePopup = (function() {
             paneContent = doc.querySelector('.paneContent');
         if ( paddingTop !== paneContent.style.paddingTop ) {
             paneContent.style.setProperty('padding-top', paddingTop);
-            localStorage.setItem('paneContentPaddingTop', paddingTop);
+            vAPI.localStorage.setItem('paneContentPaddingTop', paddingTop);
         }
         document.body.classList.toggle(
             'hConstrained',

src/js/start.js

@@ -54,7 +54,7 @@ var µm = µMatrix;
 
 */
 
-var defaultLocalUserSettings = {
+µm.defaultLocalUserSettings = {
     // data-URI background courtesy of https://github.com/dev-random
     // https://github.com/gorhill/uMatrix/issues/429#issuecomment-194548243
     placeholderBackground: [
@@ -135,15 +135,15 @@ var onAllDone = function() {
     µm.assets.addObserver(µm.assetObserver.bind(µm));
     µm.scheduleAssetUpdater(µm.userSettings.autoUpdate ? 7 * 60 * 1000 : 0);
 
-    for ( var key in defaultLocalUserSettings ) {
-        if ( defaultLocalUserSettings.hasOwnProperty(key) === false ) {
+    for ( var key in µm.defaultLocalUserSettings ) {
+        if (µm. defaultLocalUserSettings.hasOwnProperty(key) === false ) {
             continue;
         }
         if (
             vAPI.localStorage.getItem(key) === null ||
             rwLocalUserSettings.hasOwnProperty(key) === false
         ) {
-            vAPI.localStorage.setItem(key, defaultLocalUserSettings[key]);
+            vAPI.localStorage.setItem(key, µm.defaultLocalUserSettings[key]);
         }
     }