Merge pull request #70 from spiralx/master

Cookie string parsing fixes

Author: bgrins

snippets.json

@@ -74,11 +74,11 @@
     },
     {
       "name": "viewcookies",
-      "content": "// viewcookies.js\n// https://github.com/bgrins/devtools-snippets\n// Shows all cookies stored in document.cookies in a console.table\n\n(function() {\n  window.viewCookies = function() {\n    var rawCookies = document.cookie.split(';'), cookies = [];\n    rawCookies.forEach(function(cookie) {\n      var parsedCookie = cookie.split('='), cookieData = {};\n      cookies.push({\n        'key': parsedCookie.shift(),\n        'value': decodeURIComponent(parsedCookie.join('='))\n      });\n    });\n    console.table(cookies);\n  };\n})();\n\nwindow.viewCookies();\n"
+      "content": "// viewcookies.js\n// https://github.com/bgrins/devtools-snippets\n// Shows all cookies stored in document.cookies in a console.table\n\n(function() {\n  'use strict';\n\n  window.viewCookies = function() {\n    if (document.cookie) {\n      const cookies = document.cookie\n        .split(/; ?/)\n        .map(s => {\n          const [ , key, value ] = s.match(/^(.*?)=(.*)$/);\n          return {\n            key,\n            value: decodeURIComponent(value)\n          };\n        });\n\n      console.table(cookies);\n    }\n    else {\n      console.warn('document.cookie is empty!');\n    }\n  };\n})();\n\nwindow.viewCookies();\n"
     },
     {
       "name": "wrapelement",
       "content": "// wrapelement.js\n// https://github.com/bgrins/devtools-snippets\n// Wrap a given element in a given type of element\n// wrapElement('.foo', 'h1');\n// wrapElement(document.querySelector('#bar'), 'div');\n//\n// LICENSE: [MIT](http://gkatsev.mit-license.org)\n\n(function() {\n  window.wrapElement = function(el, whatToWrapIn) {\n    var newParent = document.createElement(whatToWrapIn),\n        oldParent,\n        nextSibling;\n\n    if (typeof el === 'string') {\n      el = document.querySelector(el);\n    }\n\n    oldParent = el.parentNode;\n    nextSibling = el.nextSibling;\n    newParent.appendChild(el);\n    if (nextSibling) {\n      oldParent.insertBefore(newParent, nextSibling);\n    } else {\n      oldParent.appendChild(newParent);\n    }\n  }\n\n})();\n"
     }
   ]
-}
+}

snippets/viewcookies/viewcookies.js

@@ -3,16 +3,25 @@
 // Shows all cookies stored in document.cookies in a console.table
 
 (function() {
+  'use strict';
+
   window.viewCookies = function() {
-    var rawCookies = document.cookie.split(';'), cookies = [];
-    rawCookies.forEach(function(cookie) {
-      var parsedCookie = cookie.split('='), cookieData = {};
-      cookies.push({
-        'key': parsedCookie.shift(),
-        'value': decodeURIComponent(parsedCookie.join('='))
-      });
-    });
-    console.table(cookies);
+    if (document.cookie) {
+      const cookies = document.cookie
+        .split(/; ?/)
+        .map(s => {
+          const [ , key, value ] = s.match(/^(.*?)=(.*)$/);
+          return {
+            key,
+            value: decodeURIComponent(value)
+          };
+        });
+
+      console.table(cookies);
+    }
+    else {
+      console.warn('document.cookie is empty!');
+    }
   };
 })();