Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-18 15:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

$resource should encode url params with encodeURIComponent

Browse source
This commit is contained in:
Igor Minar 2011-02-10 17:57:42 -08:00
parent 4f6fe1d479
commit e9ce22592a
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Resource.js
View file

@ -19,13 +19,13 @@ Route.prototype = {
params = params || {}; params = params || {};
forEach(this.urlParams, function(_, urlParam){ forEach(this.urlParams, function(_, urlParam){
var value = params[urlParam] || self.defaults[urlParam] || ""; var value = params[urlParam] || self.defaults[urlParam] || "";
url = url.replace(new RegExp(":" + urlParam + "(\\W)"), value + "$1"); url = url.replace(new RegExp(":" + urlParam + "(\\W)"), encodeURIComponent(value) + "$1");
}); });
url = url.replace(/\/?#$/, ''); url = url.replace(/\/?#$/, '');
var query = []; var query = [];
forEachSorted(params, function(value, key){ forEachSorted(params, function(value, key){
if (!self.urlParams[key]) { if (!self.urlParams[key]) {
query.push(encodeURI(key) + '=' + encodeURI(value)); query.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
} }
}); });
url = url.replace(/\/*$/, ''); url = url.replace(/\/*$/, '');

8
test/ResourceSpec.js
View file

@ -40,6 +40,14 @@ describe("resource", function() {
R.get({a:4, b:5, c:6}); R.get({a:4, b:5, c:6});
}); });
it('should correctly encode url params', function(){
var R = resource.route('/Path/:a');
xhr.expectGET('/Path/foo%231').respond({});
xhr.expectGET('/Path/doh!%40foo?bar=baz%231').respond({});
R.get({a: 'foo#1'});
R.get({a: 'doh!@foo', bar: 'baz#1'});
});
it("should build resource with default param", function(){ it("should build resource with default param", function(){
xhr.expectGET('/Order/123/Line/456.visa?minimum=0.05').respond({id:'abc'}); xhr.expectGET('/Order/123/Line/456.visa?minimum=0.05').respond({id:'abc'});
var LineItem = resource.route('/Order/:orderId/Line/:id:verb', {orderId: '123', id: '@id.key', verb:'.visa', minimum:0.05}); var LineItem = resource.route('/Order/:orderId/Line/:id:verb', {orderId: '123', id: '@id.key', verb:'.visa', minimum:0.05});