compatible for LZString.decompress

libs/utils.js

@@ -163,28 +163,30 @@ utils.prototype.setLocalStorage = function(key, value) {
     }
 }
 
-////// 获得本地存储 //////
+utils.prototype.decompress = function (value) {
-utils.prototype.getLocalStorage = function(key, defaultValue) {
     try {
-        var value = localStorage.getItem(core.firstData.name+"_"+key);
-        if (core.isset(value)) {
         var output = lzw_decode(value);
-            if (core.isset(output) && output.length>0) {
+        if (core.isset(output) && output.length > 0)
-                try {
             return JSON.parse(output);
     }
-                catch (ee) {
+    catch (e) {}
-                    // Ignore, use default value
+    try {
-                }
+        var output = LZString.decompress(value);
+        if (core.isset(output) && output.length > 0)
+            return JSON.parse(output);
     }
+    catch (e) {}
+    try {
         return JSON.parse(value);
     }
-        return defaultValue;
+    catch (e) {main.log(e);}
-    }
+    return null;
-    catch (e) {
+}
-        main.log(e);
+
-        return defaultValue;
+////// 获得本地存储 //////
-    }
+utils.prototype.getLocalStorage = function(key, defaultValue) {
+    var res = this.decompress(localStorage.getItem(core.firstData.name+"_"+key));
+    return res==null?defaultValue:res;
 }
 
 ////// 移除本地存储 //////
@@ -244,18 +246,9 @@ utils.prototype.getLocalForage = function (key, defaultValue, successCallback, e
         else {
             if (!core.isset(successCallback)) return;
             if (core.isset(value)) {
-                try {
+                var res = core.utils.decompress(value);
-                    var output = lzw_decode(value);
+                successCallback(res==null?defaultValue:res);
-                    if (core.isset(output) && output.length>0) {
-                        try {
-                            successCallback(JSON.parse(output));
                 return;
-                        } catch (ee) {main.log(ee);}
-                    }
-                    successCallback(JSON.parse(value));
-                    return;
-                }
-                catch (e) {main.log(e);}
             }
             successCallback(defaultValue);
         }