Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(Angular.js): allow query parameter arrays #3025

Closed
wants to merge 3 commits into from
Closed

fix(Angular.js): allow query parameter arrays #3025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d325ddd
update key value parser to create array for duplicate keys
penfold Jun 21, 2013
2d0befc
Update toKeyValue to stringify key/value pair with arrays.
penfold Jun 21, 2013
95b2ad3
Added test for duplicate key value pairs
penfold Jun 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 30 additions & 7 deletions src/Angular.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,22 +827,45 @@ function startingTag(element) {
*/
function parseKeyValue(/**string*/keyValue) {
var obj = {}, key_value, key;
forEach((keyValue || "").split('&'), function(keyValue){
forEach((keyValue || "").split('&'), function(keyValue) {
if (keyValue) {
key_value = keyValue.split('=');
key = decodeURIComponent(key_value[0]);
obj[key] = isDefined(key_value[1]) ? decodeURIComponent(key_value[1]) : true;

if (obj.hasOwnProperty(key)) {
var innerObj = obj[key];
var value = isDefined(key_value[1]) ? decodeURIComponent(key_value[1]) : true;
if (isArray(innerObj)) {
innerObj.push(value);
}
else {
var newArray = [];
newArray.push(innerObj);
newArray.push(value);
obj[key] = newArray;
}
}
else {
obj[key] = isDefined(key_value[1]) ? decodeURIComponent(key_value[1]) : true;
}
}
});
return obj;
}

function toKeyValue(obj) {
var parts = [];
forEach(obj, function(value, key) {
parts.push(encodeUriQuery(key, true) + (value === true ? '' : '=' + encodeUriQuery(value, true)));
});
return parts.length ? parts.join('&') : '';
var parts = [];
forEach(obj, function(value, key) {
if (isArray(value)) {
forEach(value, function(arrayValue) {
parts.push(encodeUriQuery(key, true) + (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true)));
});
}
else {
parts.push(encodeUriQuery(key, true) + (value === true ? '' : '=' + encodeUriQuery(value, true)));
}
});
return parts.length ? parts.join('&') : '';
}


Expand Down
2 changes: 2 additions & 0 deletions test/AngularSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ describe('angular', function() {
expect(parseKeyValue('emptyKey=')).toEqual({emptyKey: ''});
expect(parseKeyValue('flag1&key=value&flag2')).
toEqual({flag1: true, key: 'value', flag2: true});
expect(parseKeyValue('key=value1&key=value2')).toEqual({key: ['value1','value2]'});
});
});

Expand All @@ -322,6 +323,7 @@ describe('angular', function() {
expect(toKeyValue({'escaped key': 'escaped value'})).
toEqual('escaped%20key=escaped%20value');
expect(toKeyValue({emptyKey: ''})).toEqual('emptyKey=');
expect(toKeyValue({key: ['value1','value2]'}).toEqual('key=value1&key=value2');
});

it('should parse true values into flags', function() {
Expand Down