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

Commit e41a442

Browse files
committed
v1.5.0-build.4267+sha.e1f4f23
1 parent 154e15c commit e41a442

34 files changed

+329
-284
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.4264+sha.630280c
2+
* @license AngularJS v1.5.0-build.4267+sha.e1f4f23
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.4264+sha.630280c
2+
* @license AngularJS v1.5.0-build.4267+sha.e1f4f23
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.4264+sha.630280c
2+
* @license AngularJS v1.5.0-build.4267+sha.e1f4f23
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.4264+sha.630280c
2+
* @license AngularJS v1.5.0-build.4267+sha.e1f4f23
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.4264+sha.630280c/' +
62+
message += '\nhttp://errors.angularjs.org/1.5.0-build.4267+sha.e1f4f23/' +
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.4264+sha.630280c
2+
* @license AngularJS v1.5.0-build.4267+sha.e1f4f23
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.4264+sha.630280c
2+
* @license AngularJS v1.5.0-build.4267+sha.e1f4f23
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.4264+sha.630280c
2+
* @license AngularJS v1.5.0-build.4267+sha.e1f4f23
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

snapshot/angular-resource.js

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

snapshot/angular-resource.min.js

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

snapshot/angular-route.js

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

snapshot/angular-route.min.js

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

snapshot/angular-sanitize.js

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

snapshot/angular-sanitize.min.js

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

snapshot/angular-scenario.js

+25-3
Original file line numberDiff line numberDiff line change
@@ -9190,7 +9190,7 @@ return jQuery;
91909190
}));
91919191

91929192
/**
9193-
* @license AngularJS v1.5.0-build.4264+sha.630280c
9193+
* @license AngularJS v1.5.0-build.4267+sha.e1f4f23
91949194
* (c) 2010-2015 Google, Inc. http://angularjs.org
91959195
* License: MIT
91969196
*/
@@ -9249,7 +9249,7 @@ function minErr(module, ErrorConstructor) {
92499249
return match;
92509250
});
92519251

9252-
message += '\nhttp://errors.angularjs.org/1.5.0-build.4264+sha.630280c/' +
9252+
message += '\nhttp://errors.angularjs.org/1.5.0-build.4267+sha.e1f4f23/' +
92539253
(module ? module + '/' : '') + code;
92549254

92559255
for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
@@ -11572,7 +11572,7 @@ function toDebugString(obj) {
1157211572
* - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
1157311573
*/
1157411574
var version = {
11575-
full: '1.5.0-build.4264+sha.630280c', // all of these placeholder strings will be replaced by grunt's
11575+
full: '1.5.0-build.4267+sha.e1f4f23', // all of these placeholder strings will be replaced by grunt's
1157611576
major: 1, // package task
1157711577
minor: 5,
1157811578
dot: 0,
@@ -21853,6 +21853,16 @@ function ensureSafeFunction(obj, fullExpression) {
2185321853
}
2185421854
}
2185521855

21856+
function ensureSafeAssignContext(obj, fullExpression) {
21857+
if (obj) {
21858+
if (obj === (0).constructor || obj === (false).constructor || obj === ''.constructor ||
21859+
obj === {}.constructor || obj === [].constructor || obj === Function.constructor) {
21860+
throw $parseMinErr('isecaf',
21861+
'Assigning to a constructor is disallowed! Expression: {0}', fullExpression);
21862+
}
21863+
}
21864+
}
21865+
2185621866
var OPERATORS = createMap();
2185721867
forEach('+ - * / % === !== == != < > <= >= && || ! = |'.split(' '), function(operator) { OPERATORS[operator] = true; });
2185821868
var ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
@@ -22568,6 +22578,7 @@ ASTCompiler.prototype = {
2256822578
'ensureSafeObject',
2256922579
'ensureSafeFunction',
2257022580
'getStringValue',
22581+
'ensureSafeAssignContext',
2257122582
'ifDefined',
2257222583
'plus',
2257322584
'text',
@@ -22577,6 +22588,7 @@ ASTCompiler.prototype = {
2257722588
ensureSafeObject,
2257822589
ensureSafeFunction,
2257922590
getStringValue,
22591+
ensureSafeAssignContext,
2258022592
ifDefined,
2258122593
plusFn,
2258222594
expression);
@@ -22804,6 +22816,7 @@ ASTCompiler.prototype = {
2280422816
self.if_(self.notNull(left.context), function() {
2280522817
self.recurse(ast.right, right);
2280622818
self.addEnsureSafeObject(self.member(left.context, left.name, left.computed));
22819+
self.addEnsureSafeAssignContext(left.context);
2280722820
expression = self.member(left.context, left.name, left.computed) + ast.operator + right;
2280822821
self.assign(intoId, expression);
2280922822
recursionFn(intoId || expression);
@@ -22929,6 +22942,10 @@ ASTCompiler.prototype = {
2292922942
this.current().body.push(this.ensureSafeFunction(item), ';');
2293022943
},
2293122944

22945+
addEnsureSafeAssignContext: function(item) {
22946+
this.current().body.push(this.ensureSafeAssignContext(item), ';');
22947+
},
22948+
2293222949
ensureSafeObject: function(item) {
2293322950
return 'ensureSafeObject(' + item + ',text)';
2293422951
},
@@ -22945,6 +22962,10 @@ ASTCompiler.prototype = {
2294522962
this.assign(item, 'getStringValue(' + item + ',text)');
2294622963
},
2294722964

22965+
ensureSafeAssignContext: function(item) {
22966+
return 'ensureSafeAssignContext(' + item + ',text)';
22967+
},
22968+
2294822969
lazyRecurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
2294922970
var self = this;
2295022971
return function() {
@@ -23122,6 +23143,7 @@ ASTInterpreter.prototype = {
2312223143
var lhs = left(scope, locals, assign, inputs);
2312323144
var rhs = right(scope, locals, assign, inputs);
2312423145
ensureSafeObject(lhs.value, self.expression);
23146+
ensureSafeAssignContext(lhs.context);
2312523147
lhs.context[lhs.name] = rhs;
2312623148
return context ? {value: rhs} : rhs;
2312723149
};

snapshot/angular-touch.js

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

snapshot/angular-touch.min.js

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

snapshot/angular.js

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.0-build.4264+sha.630280c
2+
* @license AngularJS v1.5.0-build.4267+sha.e1f4f23
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -57,7 +57,7 @@ function minErr(module, ErrorConstructor) {
5757
return match;
5858
});
5959

60-
message += '\nhttp://errors.angularjs.org/1.5.0-build.4264+sha.630280c/' +
60+
message += '\nhttp://errors.angularjs.org/1.5.0-build.4267+sha.e1f4f23/' +
6161
(module ? module + '/' : '') + code;
6262

6363
for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
@@ -2380,7 +2380,7 @@ function toDebugString(obj) {
23802380
* - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
23812381
*/
23822382
var version = {
2383-
full: '1.5.0-build.4264+sha.630280c', // all of these placeholder strings will be replaced by grunt's
2383+
full: '1.5.0-build.4267+sha.e1f4f23', // all of these placeholder strings will be replaced by grunt's
23842384
major: 1, // package task
23852385
minor: 5,
23862386
dot: 0,
@@ -12661,6 +12661,16 @@ function ensureSafeFunction(obj, fullExpression) {
1266112661
}
1266212662
}
1266312663

12664+
function ensureSafeAssignContext(obj, fullExpression) {
12665+
if (obj) {
12666+
if (obj === (0).constructor || obj === (false).constructor || obj === ''.constructor ||
12667+
obj === {}.constructor || obj === [].constructor || obj === Function.constructor) {
12668+
throw $parseMinErr('isecaf',
12669+
'Assigning to a constructor is disallowed! Expression: {0}', fullExpression);
12670+
}
12671+
}
12672+
}
12673+
1266412674
var OPERATORS = createMap();
1266512675
forEach('+ - * / % === !== == != < > <= >= && || ! = |'.split(' '), function(operator) { OPERATORS[operator] = true; });
1266612676
var ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
@@ -13376,6 +13386,7 @@ ASTCompiler.prototype = {
1337613386
'ensureSafeObject',
1337713387
'ensureSafeFunction',
1337813388
'getStringValue',
13389+
'ensureSafeAssignContext',
1337913390
'ifDefined',
1338013391
'plus',
1338113392
'text',
@@ -13385,6 +13396,7 @@ ASTCompiler.prototype = {
1338513396
ensureSafeObject,
1338613397
ensureSafeFunction,
1338713398
getStringValue,
13399+
ensureSafeAssignContext,
1338813400
ifDefined,
1338913401
plusFn,
1339013402
expression);
@@ -13612,6 +13624,7 @@ ASTCompiler.prototype = {
1361213624
self.if_(self.notNull(left.context), function() {
1361313625
self.recurse(ast.right, right);
1361413626
self.addEnsureSafeObject(self.member(left.context, left.name, left.computed));
13627+
self.addEnsureSafeAssignContext(left.context);
1361513628
expression = self.member(left.context, left.name, left.computed) + ast.operator + right;
1361613629
self.assign(intoId, expression);
1361713630
recursionFn(intoId || expression);
@@ -13737,6 +13750,10 @@ ASTCompiler.prototype = {
1373713750
this.current().body.push(this.ensureSafeFunction(item), ';');
1373813751
},
1373913752

13753+
addEnsureSafeAssignContext: function(item) {
13754+
this.current().body.push(this.ensureSafeAssignContext(item), ';');
13755+
},
13756+
1374013757
ensureSafeObject: function(item) {
1374113758
return 'ensureSafeObject(' + item + ',text)';
1374213759
},
@@ -13753,6 +13770,10 @@ ASTCompiler.prototype = {
1375313770
this.assign(item, 'getStringValue(' + item + ',text)');
1375413771
},
1375513772

13773+
ensureSafeAssignContext: function(item) {
13774+
return 'ensureSafeAssignContext(' + item + ',text)';
13775+
},
13776+
1375613777
lazyRecurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
1375713778
var self = this;
1375813779
return function() {
@@ -13930,6 +13951,7 @@ ASTInterpreter.prototype = {
1393013951
var lhs = left(scope, locals, assign, inputs);
1393113952
var rhs = right(scope, locals, assign, inputs);
1393213953
ensureSafeObject(lhs.value, self.expression);
13954+
ensureSafeAssignContext(lhs.context);
1393313955
lhs.context[lhs.name] = rhs;
1393413956
return context ? {value: rhs} : rhs;
1393513957
};

0 commit comments

Comments
 (0)