Skip to content

Commit

Permalink
fix($resource): Route constructor, updated RegExp
Browse files Browse the repository at this point in the history
Update RegExp to allow urlParams with out leading slash (/).
- 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.
  • Loading branch information
fredrikbonander authored and mhevery committed Jan 19, 2013
1 parent 2f437e8 commit 06ed8ef
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/ngResource/resource.js
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ angular.module('ngResource', ['ng']).
this.defaults = defaults || {};
var urlParams = this.urlParams = {};
forEach(template.split(/\W/), function(param){
if (param && template.match(new RegExp("[^\\\\]:" + param + "\\W"))) {
if (param && (new RegExp("((\\w|\\/|^)(?!\\\\:" + param + ")):" + param + "\\W")).test(template)) {
urlParams[param] = true;
}
});
Expand Down
6 changes: 6 additions & 0 deletions test/ngResource/resourceSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,12 @@ describe("resource", function() {
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(':a');
$httpBackend.expect('GET', 'data.json').respond('{}');
R.get({ a: 'data.json' });
});


it('should encode & in url params', function() {
var R = $resource('/Path/:a');
Expand Down

0 comments on commit 06ed8ef

Please sign in to comment.