Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit 8721679

Browse files
v1.7.9
1 parent 56690b5 commit 8721679

File tree

5 files changed

+21
-26
lines changed

5 files changed

+21
-26
lines changed

angular.js

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.7.8
2+
* @license AngularJS v1.7.9
33
* (c) 2010-2018 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -99,7 +99,7 @@ function isValidObjectMaxDepth(maxDepth) {
9999
function minErr(module, ErrorConstructor) {
100100
ErrorConstructor = ErrorConstructor || Error;
101101

102-
var url = 'https://errors.angularjs.org/1.7.8/';
102+
var url = 'https://errors.angularjs.org/1.7.9/';
103103
var regex = url.replace('.', '\\.') + '[\\s\\S]*';
104104
var errRegExp = new RegExp(regex, 'g');
105105

@@ -481,8 +481,10 @@ function baseExtend(dst, objs, deep) {
481481
} else if (isElement(src)) {
482482
dst[key] = src.clone();
483483
} else {
484-
if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
485-
baseExtend(dst[key], [src], true);
484+
if (key !== '__proto__') {
485+
if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
486+
baseExtend(dst[key], [src], true);
487+
}
486488
}
487489
} else {
488490
dst[key] = src;
@@ -2805,11 +2807,11 @@ function toDebugString(obj, maxDepth) {
28052807
var version = {
28062808
// These placeholder strings will be replaced by grunt's `build` task.
28072809
// They need to be double- or single-quoted.
2808-
full: '1.7.8',
2810+
full: '1.7.9',
28092811
major: 1,
28102812
minor: 7,
2811-
dot: 8,
2812-
codeName: 'enthusiastic-oblation'
2813+
dot: 9,
2814+
codeName: 'indeterminate-frosting'
28132815
};
28142816

28152817

@@ -2959,7 +2961,7 @@ function publishExternalAPI(angular) {
29592961
});
29602962
}
29612963
])
2962-
.info({ angularVersion: '1.7.8' });
2964+
.info({ angularVersion: '1.7.9' });
29632965
}
29642966

29652967
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -34424,14 +34426,7 @@ var ngHideDirective = ['$animate', function($animate) {
3442434426
var ngStyleDirective = ngDirective(function(scope, element, attr) {
3442534427
scope.$watchCollection(attr.ngStyle, function ngStyleWatchAction(newStyles, oldStyles) {
3442634428
if (oldStyles && (newStyles !== oldStyles)) {
34427-
if (!newStyles) {
34428-
newStyles = {};
34429-
}
34430-
forEach(oldStyles, function(val, style) {
34431-
if (newStyles[style] == null) {
34432-
newStyles[style] = '';
34433-
}
34434-
});
34429+
forEach(oldStyles, function(val, style) { element.css(style, ''); });
3443534430
}
3443634431
if (newStyles) element.css(newStyles);
3443734432
});

0 commit comments

Comments
 (0)