serialize object and array values regardless of storage method

angular-local-storage.js

@@ -116,6 +116,12 @@ angularLocalStorage.provider('localStorageService', function() {
     // Example use: localStorageService.add('library','angular');
     var addToLocalStorage = function (key, value) {
 
+      var serializedValue = value;
+      // Serialize objects regardless of storage method
+      if (angular.isObject(value) || angular.isArray(value)) {
+        serializedValue = angular.toJson(value);
+      }
+
       // If this browser does not support local storage use cookies
       if (!browserSupportsLocalStorage || self.storageType === 'cookie') {
         if (!browserSupportsLocalStorage) {
@@ -125,25 +131,24 @@ angularLocalStorage.provider('localStorageService', function() {
         if (notify.setItem) {
           $rootScope.$broadcast('LocalStorageModule.notification.setitem', {key: key, newvalue: value, storageType: 'cookie'});
         }
-        return addToCookies(key, value);
+        return addToCookies(key, serializedValue);
       }
 
       // Let's convert undefined values to null to get the value consistent
       if (typeof value === "undefined") {
         value = null;
       }
 
+      // Try local storage
       try {
-        if (angular.isObject(value) || angular.isArray(value)) {
-          value = angular.toJson(value);
-        }
-        if (webStorage) {webStorage.setItem(deriveQualifiedKey(key), value)};
+        if (webStorage) {webStorage.setItem(deriveQualifiedKey(key), serializedValue)};
         if (notify.setItem) {
           $rootScope.$broadcast('LocalStorageModule.notification.setitem', {key: key, newvalue: value, storageType: self.storageType});
         }
+      // Fallback to cookies
       } catch (e) {
         $rootScope.$broadcast('LocalStorageModule.notification.error', e.message);
-        return addToCookies(key, value);
+        return addToCookies(key, serializedValue);
       }
       return true;
     };
@@ -329,7 +334,7 @@ angularLocalStorage.provider('localStorageService', function() {
           thisCookie = thisCookie.substring(1,thisCookie.length);
         }
         if (thisCookie.indexOf(deriveQualifiedKey(key) + '=') === 0) {
-          return decodeURIComponent(thisCookie.substring(prefix.length + key.length + 1, thisCookie.length));
+          return angular.fromJSon(decodeURIComponent(thisCookie.substring(prefix.length + key.length + 1, thisCookie.length)));
         }
       }
       return null;