Merge branch 'master' of https://github.com/agrublev/Angular-localStorage

agrublev · agrublev · commit 8fdc8296067a · 2013-08-10T10:25:56.000-07:00
diff --git a/src/localStorage.js b/src/localStorage.js
@@ -1,9 +1,9 @@
-angular.module('localStorage', ['ngCookies']).factory('$store', function ($parse, $cookieStore) {
+angular.module('localStorage', ['ngCookies']).factory('$store', function ($parse, $cookieStore, $window, $log) {
 	/**
 	 * Global Vars
 	 */
-	var storage = (typeof window.localStorage === 'undefined') ? undefined : window.localStorage;
-	var supported = !(typeof storage === 'undefined' || typeof window.JSON === 'undefined');
+	var storage = (typeof $window.localStorage === 'undefined') ? undefined : $window.localStorage;
+	var supported = !(typeof storage === 'undefined' || typeof $window.JSON === 'undefined');
 
 	var privateMethods = {
 		/**
@@ -14,7 +14,7 @@ angular.module('localStorage', ['ngCookies']).factory('$store', function ($parse
 		parseValue: function (res) {
 			var val;
 			try {
-				val = JSON.parse(res);
+				val = $window.JSON.parse(res);
 				if (typeof val === 'undefined') {
 					val = res;
 				}
@@ -24,8 +24,8 @@ angular.module('localStorage', ['ngCookies']).factory('$store', function ($parse
 				if (val === 'false') {
 					val = false;
 				}
-				if (parseFloat(val) === val && !angular.isObject(val)) {
-					val = parseFloat(val);
+				if ($window.parseFloat(val) === val && !angular.isObject(val)) {
+					val = $window.parseFloat(val);
 				}
 			} catch (e) {
 				val = res;
@@ -47,10 +47,10 @@ angular.module('localStorage', ['ngCookies']).factory('$store', function ($parse
 					$cookieStore.put(key, value);
 					return value;
 				} catch(e) {
-					console.log('Local Storage not supported, make sure you have angular-cookies enabled.');
+					$log.log('Local Storage not supported, make sure you have angular-cookies enabled.');
 				}
 			}
-			var saver = JSON.stringify(value);
+			var saver = $window.JSON.stringify(value);
 			storage.setItem(key, saver);
 			return privateMethods.parseValue(saver);
 		},
