[Bug #8592] - Improve localStorage feature detection

qooxdoo · Sep 18, 2014 · aa37aa1 · aa37aa1
1 parent e1687b5
commit aa37aa1
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/framework/source/class/qx/bom/client/Html.js b/framework/source/class/qx/bom/client/Html.js
@@ -203,16 +203,13 @@ qx.Bootstrap.define("qx.bom.client.Html",
      */
     getLocalStorage : function() {
       try {
-        var has = window.localStorage != null;
         // write once to make sure to catch safari's private mode [BUG #7718]
-        if (has) {
-          window.sessionStorage.setItem("$qx_check", "test");
-          window.sessionStorage.removeItem("$qx_check");
-        }
-        return has;
+        window.localStorage.setItem("$qx_check", "test");
+        window.localStorage.removeItem("$qx_check");
+        return true;
       } catch (exc) {
-        // Firefox Bug: Local execution of window.sessionStorage throws error
-        // see https://bugzilla.mozilla.org/show_bug.cgi?id=357323
+        // Firefox Bug: localStorage doesn't work in file:/// documents
+        // see https://bugzilla.mozilla.org/show_bug.cgi?id=507361
         return false;
       }
     },
@@ -226,13 +223,10 @@ qx.Bootstrap.define("qx.bom.client.Html",
      */
     getSessionStorage : function() {
       try {
-        var has = window.sessionStorage != null;
         // write once to make sure to catch safari's private mode [BUG #7718]
-        if (has) {
-          window.sessionStorage.setItem("$qx_check", "test");
-          window.sessionStorage.removeItem("$qx_check");
-        }
-        return has;
+        window.sessionStorage.setItem("$qx_check", "test");
+        window.sessionStorage.removeItem("$qx_check");
+        return true;
       } catch (exc) {
         // Firefox Bug: Local execution of window.sessionStorage throws error
         // see https://bugzilla.mozilla.org/show_bug.cgi?id=357323