Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-22 21:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(resource): Update RegExp to allow urlParams with out leading slash

Browse source 
Will allow reoucese to be loaded from a relative path
Example:
var R = $resource(':path');
R.get({ path : 'data.json' });

Example usage:
Load resources in applications not using webserver, ie local webapp in 
on a tablet.
This commit is contained in:
Fredrik Bonander 2013-01-23 10:53:49 +01:00 committed by Misko Hevery
parent 755beb2b66
commit b7e1fb0515
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ngResource/resource.js
View file

@ -308,7 +308,7 @@ angular.module('ngResource', ['ng']).
this.defaults = defaults || {}; this.defaults = defaults || {};
var urlParams = this.urlParams = {}; var urlParams = this.urlParams = {};
forEach(template.split(/\W/), function(param){ forEach(template.split(/\W/), function(param){
if (param && template.match(new RegExp("[^\\\\]:" + param + "\\W"))) { if (param && (new RegExp("(^|[^\\\\]):" + param + "\\W").test(template))) {
urlParams[param] = true; urlParams[param] = true;
} }
}); });

12
test/ngResource/resourceSpec.js
View file

@ -129,6 +129,18 @@ describe("resource", function() {
R.get({a: 'doh@fo o', ':bar': '$baz@1', '!do&h': 'g=a h'}); R.get({a: 'doh@fo o', ':bar': '$baz@1', '!do&h': 'g=a h'});
}); });
it('should allow relative paths in resource url', function () {
var R = $resource(':relativePath');
$httpBackend.expect('GET', 'data.json').respond('{}');
R.get({ relativePath: 'data.json' });
});
it('should handle + in url params', function () {
var R = $resource('/api/myapp/:myresource?from=:from&to=:to&histlen=:histlen');
$httpBackend.expect('GET', '/api/myapp/pear+apple?from=2012-04-01&to=2012-04-29&histlen=3').respond('{}');
R.get({ myresource: 'pear+apple', from : '2012-04-01', to : '2012-04-29', histlen : 3 });
});
it('should encode & in url params', function() { it('should encode & in url params', function() {
var R = $resource('/Path/:a'); var R = $resource('/Path/:a');