Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-29 12:30:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix($location): Use encodeUriQuery instead of escape

Browse source 
Closes #492
This commit is contained in:
Kai Groner 2011-09-02 16:28:52 -04:00 committed by Vojta Jina
parent aac68bf2ba
commit 7e1f364177
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Angular.js
View file

@ -859,8 +859,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;
@ -869,7 +869,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('&') : '';
}

2
src/service/location.js
View file

@ -331,7 +331,7 @@ LocationUrl.prototype = LocationHashbangUrl.prototype = {
if (paramValue === null) {
delete this.$$search[search];
} else {
this.$$search[search] = escape(paramValue);
this.$$search[search] = encodeUriQuery(paramValue);
}
} else {
this.$$search = isString(search) ? parseKeyValue(search) : search;