Merge branch 'pr/30'

Author: ocombe

dist/angular-localForage.js

@@ -81,18 +81,19 @@
 // Directly adds a value to storage
 var setItem = function(key, value) {
 var deferred = $q.defer(),
-args = arguments;
+args = arguments,
+localCopy = angular.copy(value);
 
-//avoid $promises attributes from value objects, if is there.
-if (angular.isObject(value) && angular.isDefined(value.$promise)) {
-delete value.$promise; //delete attribut from object structure.
+//avoid $promises attributes from value objects, if present.
+if (angular.isObject(localCopy) && angular.isDefined(localCopy.$promise)) {
+delete localCopy.$promise; //delete attribut from object structure.
 }
 
-localforage.setItem(prefix() + key, value).then(function success() {
+localforage.setItem(prefix() + key, localCopy).then(function success() {
 if(notify.setItem) {
-$rootScope.$broadcast('LocalForageModule.setItem', {key: key, newvalue: value, driver: localforage.driver()});
+$rootScope.$broadcast('LocalForageModule.setItem', {key: key, newvalue: localCopy, driver: localforage.driver()});
 }
-deferred.resolve(value);
+deferred.resolve(localCopy);
 }, function error(data) {
 onError(data, args, setItem, deferred);
 });
@@ -292,4 +293,4 @@
 }
 }
 }]);
-})(window, window.angular, window.localforage);
+})(window, window.angular, window.localforage);

dist/angular-localForage.min.js

@@ -74,18 +74,19 @@
 // Directly adds a value to storage
 var setItem = function(key, value) {
 var deferred = $q.defer(),
-args = arguments;
+args = arguments,
+localCopy = angular.copy(value);
 
-//avoid $promises attributes from value objects, if is there.
-if (angular.isObject(value) && angular.isDefined(value.$promise)) {
-delete value.$promise; //delete attribut from object structure.
+//avoid $promises attributes from value objects, if present.
+if (angular.isObject(localCopy) && angular.isDefined(localCopy.$promise)) {
+delete localCopy.$promise; //delete attribut from object structure.
 }
 
-localforage.setItem(prefix() + key, value).then(function success() {
+localforage.setItem(prefix() + key, localCopy).then(function success() {
 if(notify.setItem) {
-$rootScope.$broadcast('LocalForageModule.setItem', {key: key, newvalue: value, driver: localforage.driver()});
+$rootScope.$broadcast('LocalForageModule.setItem', {key: key, newvalue: localCopy, driver: localforage.driver()});
 }
-deferred.resolve(value);
+deferred.resolve(localCopy);
 }, function error(data) {
 onError(data, args, setItem, deferred);
 });
@@ -285,4 +286,4 @@
 }
 }
 }]);
-})(window, window.angular, window.localforage);
+})(window, window.angular, window.localforage);

src/angular-localForage.js

@@ -129,4 +129,36 @@ describe('Module: LocalForageModule', function () {
  run('webSQLStorage');
  });
 
-});
+ it('service:setItem should strip $$hashKey from arrays used in ngRepeat', function() {
+ var result = null;
+ function run(driver) {
+ return runs(function() {
+ return myService.setDriver(driver).then(function() {
+ return myService.clear().then(function() {
+ return myService.setItem('myArray', [{$$hashKey: '00A', name:'Andrew Davis'}]).then(function() {
+ return myService.getItem('myArray').then(function(data) {
+ expect(data).toEqual([{name:'Andrew Davis'}]);
+ }, function(res) {
+ console.log(res);
+ throw('Fail get item, driver = '+driver)
+ });
+ }, function(res) {
+ console.log(res);
+ throw('Fail set item, driver = '+driver)
+ });
+ }, function(res) {
+ console.log(res);
+ throw('Fail clear, driver = '+driver)
+ })
+ }, function() {
+ throw('Fail set driver '+driver)
+ })
+ });
+ }
+
+ run('asyncStorage');
+ run('localStorageWrapper');
+ run('webSQLStorage');
+ });
+
+});