aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIllniyar2013-04-20 23:33:40 +0300
committerPete Bacon Darwin2013-05-08 10:04:07 +0100
commitcf4729faa3e6e0a5178e2064a6f3cfd345686554 (patch)
tree55f983505d88214764943eb48c17f24b30d31a32
parent4f2e36068502f18814fee0abd26951124881f951 (diff)
downloadangular.js-cf4729faa3e6e0a5178e2064a6f3cfd345686554.tar.bz2
feat($cookieStore): $cookieStore.get now parses blank string as blank string
closes #1918
-rw-r--r--src/ngCookies/cookies.js3
-rw-r--r--test/ngCookies/cookiesSpec.js11
2 files changed, 13 insertions, 1 deletions
diff --git a/src/ngCookies/cookies.js b/src/ngCookies/cookies.js
index 8b46973f..68355707 100644
--- a/src/ngCookies/cookies.js
+++ b/src/ngCookies/cookies.js
@@ -139,7 +139,8 @@ angular.module('ngCookies', ['ng']).
* @returns {Object} Deserialized cookie value.
*/
get: function(key) {
- return angular.fromJson($cookies[key]);
+ var value = $cookies[key];
+ return value ? angular.fromJson(value) : value;
},
/**
diff --git a/test/ngCookies/cookiesSpec.js b/test/ngCookies/cookiesSpec.js
index 435f40b4..674c2774 100644
--- a/test/ngCookies/cookiesSpec.js
+++ b/test/ngCookies/cookiesSpec.js
@@ -125,4 +125,15 @@ describe('$cookieStore', function() {
$rootScope.$digest();
expect($browser.cookies()).toEqual({});
}));
+ it('should handle empty string value cookies', inject(function ($cookieStore, $browser, $rootScope) {
+ $cookieStore.put("emptyCookie",'');
+ $rootScope.$digest();
+ expect($browser.cookies()).
+ toEqual({ 'emptyCookie': '""' });
+ expect($cookieStore.get("emptyCookie")).toEqual('');
+
+ $browser.cookieHash['blankCookie'] = '';
+ $browser.poll();
+ expect($cookieStore.get("blankCookie")).toEqual('');
+ }))
});