Use encodeUriQuery/decodeURIComponent instead of escape/unescape in {…

…to,from}KeyValue This is bug angular#492, but I can't wait for the $location service rewrite.
groner · Sep 5, 2011 · 0a246e8 · 0a246e8
1 parent 05ad1ce
commit 0a246e8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Angular.js b/src/Angular.js
@@ -857,8 +857,8 @@ function parseKeyValue(/**string*/keyValue) {
   forEach((keyValue || "").split('&'), function(keyValue){
     if (keyValue) {
       key_value = keyValue.split('=');
-      key = unescape(key_value[0]);
-      obj[key] = isDefined(key_value[1]) ? unescape(key_value[1]) : true;
+      key = decodeURIComponent(key_value[0]);
+      obj[key] = isDefined(key_value[1]) ? decodeURIComponent(key_value[1]) : true;
     }
   });
   return obj;
@@ -867,7 +867,7 @@ function parseKeyValue(/**string*/keyValue) {
 function toKeyValue(obj) {
   var parts = [];
   forEach(obj, function(value, key) {
-    parts.push(escape(key) + (value === true ? '' : '=' + escape(value)));
+    parts.push(encodeUriQuery(key, true) + (value === true ? '' : '=' + encodeUriQuery(value, true)));
   });
   return parts.length ? parts.join('&') : '';
 }