localStorage implementation tweaks

- For consistency, uses of localStorage not being called via $window have been updated to do so. - To allow for potentiall fallbacks / polyfilling* of localStorage functionality the implementation has been moved away from accessing data directly through keys to the Storage objects functions. * For example, Safari's private browsing mode which has a 0 size quota on storage.
snapjay · Jan 29, 2016 · de5c34b · de5c34b
1 parent 711778c
commit de5c34b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/dist/ngCart.js b/dist/ngCart.js
@@ -27,7 +27,7 @@ angular.module('ngCart', ['ngCart.directives'])
 
     }])
 
-    .service('ngCart', ['$rootScope', 'ngCartItem', 'store', function ($rootScope, ngCartItem, store) {
+    .service('ngCart', ['$rootScope', '$window', 'ngCartItem', 'store', function ($rootScope, $window, ngCartItem, store) {
 
         this.init = function(){
             this.$cart = {
@@ -152,7 +152,7 @@ angular.module('ngCart', ['ngCart.directives'])
 
             $rootScope.$broadcast('ngCart:change', {});
             this.$cart.items = [];
-            localStorage.removeItem('cart');
+            $window.localStorage.removeItem('cart');
         };
 
         this.isEmpty = function () {
@@ -307,8 +307,8 @@ angular.module('ngCart', ['ngCart.directives'])
         return {
 
             get: function (key) {
-                if ($window.localStorage [key]) {
-                    var cart = angular.fromJson($window.localStorage [key]);
+                if ( $window.localStorage.getItem(key) )  {
+                    var cart = angular.fromJson( $window.localStorage.getItem(key) ) ;
                     return JSON.parse(cart);
                 }
                 return false;
@@ -319,11 +319,11 @@ angular.module('ngCart', ['ngCart.directives'])
             set: function (key, val) {
 
                 if (val === undefined) {
-                    $window.localStorage .removeItem(key);
+                    $window.localStorage.removeItem(key);
                 } else {
-                    $window.localStorage [key] = angular.toJson(val);
+                    $window.localStorage.setItem( key, angular.toJson(val) );
                 }
-                return $window.localStorage [key];
+                return $window.localStorage.getItem(key);
             }
         }
     }])

diff --git a/dist/ngCart.min.js b/dist/ngCart.min.js
diff --git a/src/ngCart.js b/src/ngCart.js
@@ -27,7 +27,7 @@ angular.module('ngCart', ['ngCart.directives'])
 
     }])
 
-    .service('ngCart', ['$rootScope', 'ngCartItem', 'store', function ($rootScope, ngCartItem, store) {
+    .service('ngCart', ['$rootScope', '$window', 'ngCartItem', 'store', function ($rootScope, $window, ngCartItem, store) {
 
         this.init = function(){
             this.$cart = {
@@ -152,7 +152,7 @@ angular.module('ngCart', ['ngCart.directives'])
 
             $rootScope.$broadcast('ngCart:change', {});
             this.$cart.items = [];
-            localStorage.removeItem('cart');
+            $window.localStorage.removeItem('cart');
         };
 
         this.isEmpty = function () {
@@ -307,8 +307,8 @@ angular.module('ngCart', ['ngCart.directives'])
         return {
 
             get: function (key) {
-                if ($window.localStorage [key]) {
-                    var cart = angular.fromJson($window.localStorage [key]);
+                if ( $window.localStorage.getItem(key) )  {
+                    var cart = angular.fromJson( $window.localStorage.getItem(key) ) ;
                     return JSON.parse(cart);
                 }
                 return false;
@@ -319,11 +319,11 @@ angular.module('ngCart', ['ngCart.directives'])
             set: function (key, val) {
 
                 if (val === undefined) {
-                    $window.localStorage .removeItem(key);
+                    $window.localStorage.removeItem(key);
                 } else {
-                    $window.localStorage [key] = angular.toJson(val);
+                    $window.localStorage.setItem( key, angular.toJson(val) );
                 }
-                return $window.localStorage [key];
+                return $window.localStorage.getItem(key);
             }
         }
     }])