Merge branch 'master' of github.com:amccollum/jar

amccollum · Jan 12, 2012 · 7598e71 · 7598e71
2 parents 56043aa + d6ed2ba
commit 7598e71
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/jar.js b/lib/jar.js
@@ -1,6 +1,6 @@
 (function(jar) {
   return jar.cookie = function(name, value, options) {
-    var cookie, date, domain, expires, m, path, secure, _i, _len, _ref;
+    var cookie, date, decoded, domain, expires, m, path, secure, _i, _len, _ref;
     if (options == null) {
       options = {};
     }
@@ -31,7 +31,12 @@
         if (Array.isArray(m)) {
           if (m[1] === name) {
             try {
-              return JSON.parse(decodeURIComponent(m[2]));
+              decoded = decodeURIComponent(m[2]);
+              try {
+                return JSON.parse(decoded);
+              } catch (e) {
+                return decoded;
+              }
             } catch (e) {
               break;
             }

diff --git a/src/jar.coffee b/src/jar.coffee
@@ -26,7 +26,11 @@
                 if Array.isArray(m)
                     if m[1] == name
                         try
-                            return JSON.parse(decodeURIComponent(m[2]))
+                            decoded = decodeURIComponent(m[2])
+                            try
+                                return JSON.parse(decoded)
+                            catch e
+                                return decoded
                         catch e
                             break