Skip to content
This repository was archived by the owner on Apr 17, 2025. It is now read-only.

Commit c885ea0

Browse files
committed
v1.5.0-build.4246+sha.1c97a60
1 parent cce5a53 commit c885ea0

32 files changed

+66
-59
lines changed

snapshot/angular-animate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.0-build.4245+sha.658a865
2+
* @license AngularJS v1.5.0-build.4246+sha.1c97a60
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

snapshot/angular-animate.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-aria.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.0-build.4245+sha.658a865
2+
* @license AngularJS v1.5.0-build.4246+sha.1c97a60
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

snapshot/angular-aria.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-cookies.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.0-build.4245+sha.658a865
2+
* @license AngularJS v1.5.0-build.4246+sha.1c97a60
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

snapshot/angular-cookies.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-loader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.0-build.4245+sha.658a865
2+
* @license AngularJS v1.5.0-build.4246+sha.1c97a60
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -59,7 +59,7 @@ function minErr(module, ErrorConstructor) {
5959
return match;
6060
});
6161

62-
message += '\nhttp://errors.angularjs.org/1.5.0-build.4245+sha.658a865/' +
62+
message += '\nhttp://errors.angularjs.org/1.5.0-build.4246+sha.1c97a60/' +
6363
(module ? module + '/' : '') + code;
6464

6565
for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {

snapshot/angular-loader.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-message-format.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.0-build.4245+sha.658a865
2+
* @license AngularJS v1.5.0-build.4246+sha.1c97a60
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

snapshot/angular-message-format.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-messages.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.0-build.4245+sha.658a865
2+
* @license AngularJS v1.5.0-build.4246+sha.1c97a60
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

snapshot/angular-messages.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-mocks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.0-build.4245+sha.658a865
2+
* @license AngularJS v1.5.0-build.4246+sha.1c97a60
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

snapshot/angular-resource.js

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.0-build.4245+sha.658a865
2+
* @license AngularJS v1.5.0-build.4246+sha.1c97a60
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -438,7 +438,9 @@ angular.module('ngResource', ['ng']).
438438
}
439439
if (!(new RegExp("^\\d+$").test(param)) && param &&
440440
(new RegExp("(^|[^\\\\]):" + param + "(\\W|$)").test(url))) {
441-
urlParams[param] = true;
441+
urlParams[param] = {
442+
isQueryParamValue: (new RegExp("\\?.*=:" + param + "(?:\\W|$)")).test(url)
443+
};
442444
}
443445
});
444446
url = url.replace(/\\:/g, ':');
@@ -448,10 +450,14 @@ angular.module('ngResource', ['ng']).
448450
});
449451

450452
params = params || {};
451-
forEach(self.urlParams, function(_, urlParam) {
453+
forEach(self.urlParams, function(paramInfo, urlParam) {
452454
val = params.hasOwnProperty(urlParam) ? params[urlParam] : self.defaults[urlParam];
453455
if (angular.isDefined(val) && val !== null) {
454-
encodedVal = encodeUriSegment(val);
456+
if (paramInfo.isQueryParamValue) {
457+
encodedVal = encodeUriQuery(val, true);
458+
} else {
459+
encodedVal = encodeUriSegment(val);
460+
}
455461
url = url.replace(new RegExp(":" + urlParam + "(\\W|$)", "g"), function(match, p1) {
456462
return encodedVal + p1;
457463
});

snapshot/angular-resource.min.js

+9-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)