diff options
| author | Igor Minar | 2013-01-22 16:30:35 -0800 |
|---|---|---|
| committer | Igor Minar | 2013-01-22 16:32:02 -0800 |
| commit | ffe5e01584ec1c10930a9a01ce4cec2ec888966b (patch) | |
| tree | 7690b8b6158cf05d05cc9e366f98e75da1cfdf52 /src/ngResource/resource.js | |
| parent | 3c2e1c5e4d12529b1d69a6173c38097527dccc4f (diff) | |
| download | angular.js-ffe5e01584ec1c10930a9a01ce4cec2ec888966b.tar.bz2 | |
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
Diffstat (limited to 'src/ngResource/resource.js')
| -rw-r--r-- | src/ngResource/resource.js | 2 |
1 files changed, 1 insertions, 1 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; } }); |