|
1 | 1 | /**
|
2 |
| - * @license AngularJS v1.7.8 |
| 2 | + * @license AngularJS v1.7.9 |
3 | 3 | * (c) 2010-2018 Google, Inc. http://angularjs.org
|
4 | 4 | * License: MIT
|
5 | 5 | */
|
@@ -99,7 +99,7 @@ function isValidObjectMaxDepth(maxDepth) {
|
99 | 99 | function minErr(module, ErrorConstructor) {
|
100 | 100 | ErrorConstructor = ErrorConstructor || Error;
|
101 | 101 |
|
102 |
| - var url = 'https://errors.angularjs.org/1.7.8/'; |
| 102 | + var url = 'https://errors.angularjs.org/1.7.9/'; |
103 | 103 | var regex = url.replace('.', '\\.') + '[\\s\\S]*';
|
104 | 104 | var errRegExp = new RegExp(regex, 'g');
|
105 | 105 |
|
@@ -481,8 +481,10 @@ function baseExtend(dst, objs, deep) {
|
481 | 481 | } else if (isElement(src)) {
|
482 | 482 | dst[key] = src.clone();
|
483 | 483 | } 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 | + } |
486 | 488 | }
|
487 | 489 | } else {
|
488 | 490 | dst[key] = src;
|
@@ -2805,11 +2807,11 @@ function toDebugString(obj, maxDepth) {
|
2805 | 2807 | var version = {
|
2806 | 2808 | // These placeholder strings will be replaced by grunt's `build` task.
|
2807 | 2809 | // They need to be double- or single-quoted.
|
2808 |
| - full: '1.7.8', |
| 2810 | + full: '1.7.9', |
2809 | 2811 | major: 1,
|
2810 | 2812 | minor: 7,
|
2811 |
| - dot: 8, |
2812 |
| - codeName: 'enthusiastic-oblation' |
| 2813 | + dot: 9, |
| 2814 | + codeName: 'indeterminate-frosting' |
2813 | 2815 | };
|
2814 | 2816 |
|
2815 | 2817 |
|
@@ -2959,7 +2961,7 @@ function publishExternalAPI(angular) {
|
2959 | 2961 | });
|
2960 | 2962 | }
|
2961 | 2963 | ])
|
2962 |
| - .info({ angularVersion: '1.7.8' }); |
| 2964 | + .info({ angularVersion: '1.7.9' }); |
2963 | 2965 | }
|
2964 | 2966 |
|
2965 | 2967 | /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
@@ -34424,14 +34426,7 @@ var ngHideDirective = ['$animate', function($animate) {
|
34424 | 34426 | var ngStyleDirective = ngDirective(function(scope, element, attr) {
|
34425 | 34427 | scope.$watchCollection(attr.ngStyle, function ngStyleWatchAction(newStyles, oldStyles) {
|
34426 | 34428 | 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, ''); }); |
34435 | 34430 | }
|
34436 | 34431 | if (newStyles) element.css(newStyles);
|
34437 | 34432 | });
|
|
0 commit comments