revert: fix($resource): Route constructor, updated RegExp

IgorMinar · IgorMinar · commit ffe5e01584ec · 2013-01-22T16:32:02.000-08:00
This reverts commit 06ed8ef. The reverted commit causes regressions. See comments in the PR: angular#1402 (comment)
diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
@@ -290,7 +290,7 @@ angular.module('ngResource', ['ng']).
       this.defaults = defaults || {};
       var urlParams = this.urlParams = {};
       forEach(template.split(/\W/), function(param){
-        if (param && (new RegExp("((\\w|\\/|^)(?!\\\\:" + param + ")):" + param + "\\W")).test(template)) {
+        if (param && template.match(new RegExp("[^\\\\]:" + param + "\\W"))) {
           urlParams[param] = true;
         }
       });
diff --git a/test/ngResource/resourceSpec.js b/test/ngResource/resourceSpec.js
@@ -129,12 +129,6 @@ 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');

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ angular.module('ngResource', ['ng']).`
`290`	`290`	`this.defaults = defaults \|\| {};`
`291`	`291`	`var urlParams = this.urlParams = {};`
`292`	`292`	`forEach(template.split(/\W/), function(param){`
`293`		`- if (param && (new RegExp("((\\w\|\\/\|^)(?!\\\\:" + param + ")):" + param + "\\W")).test(template)) {`
	`293`	`+ if (param && template.match(new RegExp("[^\\\\]:" + param + "\\W"))) {`
`294`	`294`	`urlParams[param] = true;`
`295`	`295`	`}`
`296`	`296`	`});`