Change cookie reading approach

carhartl · carhartl · commit 8018ea2b5ed8 · 2018-02-16T09:03:14.000+01:00
Collecting all cookies in a jar, and when looking for a specific one
breaking out of the loop.

By this we're also sharing one variable less (`result`) for both the
write and read functionality, which will make it easier to modularize
the library in the future.
diff --git a/src/js.cookie.js b/src/js.cookie.js
@@ -38,7 +38,6 @@
 
 	function init (converter) {
 		function api (key, value, attributes) {
-			var result;
 			if (typeof document === 'undefined') {
 				return;
 			}
@@ -58,7 +57,7 @@
 				attributes.expires = attributes.expires ? attributes.expires.toUTCString() : '';
 
 				try {
-					result = JSON.stringify(value);
+					var result = JSON.stringify(value);
 					if (/^[\{\[]/.test(result)) {
 						value = result;
 					}
@@ -98,10 +97,7 @@
 
 			// Read
 
-			if (!key) {
-				result = {};
-			}
-
+			var jar = {};
 			var decode = function (s) {
 				return s.replace(/(%[0-9A-Z]{2})+/g, decodeURIComponent);
 			};
@@ -129,18 +125,15 @@
 						} catch (e) {}
 					}
 
+					jar[name] = cookie;
+
 					if (key === name) {
-						result = cookie;
 						break;
 					}
-
-					if (!key) {
-						result[name] = cookie;
-					}
 				} catch (e) {}
 			}
 
-			return result;
+			return key ? jar[key] : jar;
 		}
 
 		api.set = api;
