From ffe5e01584ec1c10930a9a01ce4cec2ec888966b Mon Sep 17 00:00:00 2001
From: Igor Minar
Date: Tue, 22 Jan 2013 16:30:35 -0800
Subject: revert: fix($resource): Route constructor, updated RegExp

This reverts commit 06ed8ef0127bf80610eba17b5021d1f483d0b0bf.

The reverted commit causes regressions. See comments in the PR:
https://github.com/angular/angular.js/pull/1402#issuecomment-12575399
---
 src/ngResource/resource.js      | 2 +-
 test/ngResource/resourceSpec.js | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
index 549226a2..7e26a6a4 100644
--- 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
index cf3b886b..33dc6d5b 100644
--- 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');
-- 
cgit v1.2.3