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

Commit 1d34656

Browse files
CaerusKaruCaerusKaru
committed
fix(universal): remove browser check from style-utils
- Remove default value of fxLayout to avoid confusion in Universal - Removed browser checks from style-utils since getDOM will always return an implementation with the methods implemented - Added note about getComputedStyle PR pending - Updated RxJS to 5.5.0 and added necessary fixes - Added better null and type checking throughout - Updated LICENSE
1 parent cc12733 commit 1d34656

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+181
-206
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright (c) 2017 Google, Inc.
3+
Copyright (c) 2017 Google LLC.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎build-config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const buildVersion = require('./package.json').version;
1010
/** License that will be placed inside of all created bundles. */
1111
const buildLicense = `/**
1212
* @license
13-
* Copyright Google Inc. All Rights Reserved.
13+
* Copyright Google LLC All Rights Reserved.
1414
*
1515
* Use of this source code is governed by an MIT-style license that can be
1616
* found in the LICENSE file at https://angular.io/license

‎package.json

+34-33
Original file line numberDiff line numberDiff line change
@@ -26,58 +26,59 @@
2626
"node": ">= 5.4.1 <= 8"
2727
},
2828
"dependencies": {
29-
"@angular/common": "~4.4.4",
30-
"@angular/compiler": "~4.4.4",
31-
"@angular/core": "~4.4.4",
32-
"@angular/platform-browser": "~4.4.4",
33-
"core-js": "^2.4.1",
34-
"rxjs": "^5.4.2",
29+
30+
"@angular/common": "^4.4.6",
31+
"@angular/compiler": "^4.4.6",
32+
"@angular/core": "^4.4.6",
33+
"@angular/platform-browser": "^4.4.6",
34+
"core-js": "^2.5.1",
35+
"rxjs": "^5.5.0",
3536
"systemjs": "0.19.43",
3637
"tsickle": "^0.23.5",
37-
"tslib": "^1.7.1",
38-
"zone.js": "^0.8.12"
38+
"tslib": "^1.8.0",
39+
"zone.js": "^0.8.18"
3940
},
4041
"devDependencies": {
41-
"@angular/animations": "~4.4.4",
42+
"@angular/animations": "^4.4.6",
4243
"@angular/cdk": "^2.0.0-beta.12",
43-
"@angular/compiler-cli": "~4.4.4",
44-
"@angular/forms": "~4.4.4",
45-
"@angular/http": "~4.4.4",
44+
"@angular/compiler-cli": "^4.4.6",
45+
"@angular/forms": "^4.4.6",
46+
"@angular/http": "^4.4.6",
4647
"@angular/material": "^2.0.0-beta.12",
47-
"@angular/platform-browser-dynamic": "~4.4.4",
48-
"@angular/platform-server": "~4.4.4",
49-
"@angular/router": "~4.4.4",
50-
"@angular/tsc-wrapped": "~4.4.4",
51-
"@google-cloud/storage": "^1.1.1",
48+
"@angular/platform-browser-dynamic": "^4.4.6",
49+
"@angular/platform-server": "^4.4.6",
50+
"@angular/router": "^4.4.6",
51+
"@angular/tsc-wrapped": "^4.4.6",
52+
"@google-cloud/storage": "^1.4.0",
5253
"@types/chalk": "^0.4.31",
5354
"@types/fs-extra": "^3.0.1",
54-
"@types/glob": "^5.0.30",
55+
"@types/glob": "^5.0.33",
5556
"@types/gulp": "3.8.32",
5657
"@types/hammerjs": "^2.0.34",
5758
"@types/jasmine": "2.5.45",
5859
"@types/merge2": "^0.3.30",
5960
"@types/minimist": "^1.2.0",
60-
"@types/node": "^7.0.21",
61+
"@types/node": "^7.0.46",
6162
"@types/run-sequence": "^0.0.29",
6263
"@types/rx": "2.5.33",
63-
"axe-core": "^2.3.1",
64-
"axe-webdriverjs": "^1.1.1",
64+
"axe-core": "^2.4.2",
65+
"axe-webdriverjs": "^1.1.5",
6566
"chalk": "^1.1.3",
6667
"cli-color": "^1.2.0",
6768
"dgeni": "^0.4.7",
6869
"dgeni-packages": "^0.19.1",
69-
"firebase": "^4.0.0",
70-
"firebase-admin": "^5.0.0",
71-
"firebase-tools": "^3.11.0",
70+
"firebase": "^4.6.0",
71+
"firebase-admin": "^5.4.2",
72+
"firebase-tools": "^3.13.1",
7273
"fs-extra": "^3.0.1",
7374
"glob": "^7.1.2",
7475
"google-closure-compiler": "20170409.0.0",
7576
"gulp": "^3.9.1",
7677
"gulp-clean": "^0.3.2",
77-
"gulp-clean-css": "^3.3.1",
78+
"gulp-clean-css": "^3.9.0",
7879
"gulp-cli": "^1.3.0",
7980
"gulp-connect": "^5.0.0",
80-
"gulp-conventional-changelog": "^1.1.3",
81+
"gulp-conventional-changelog": "^1.1.6",
8182
"gulp-dom": "^0.9.17",
8283
"gulp-flatten": "^0.3.1",
8384
"gulp-highlight-files": "^0.0.5",
@@ -106,21 +107,21 @@
106107
"minimatch": "^3.0.4",
107108
"minimist": "^1.2.0",
108109
"prompt-sync": "^4.1.5",
109-
"protractor": "^5.1.2",
110-
"request": "^2.81.0",
110+
"protractor": "^5.2.0",
111+
"request": "^2.83.0",
111112
"resolve-bin": "^0.4.0",
112113
"rollup": "^0.41.6",
113-
"rollup-plugin-alias": "^1.3.1",
114+
"rollup-plugin-alias": "^1.4.0",
114115
"rollup-plugin-node-resolve": "^3.0.0",
115116
"run-sequence": "^1.2.2",
116117
"scss-bundle": "^2.0.1-beta.7",
117-
"selenium-webdriver": "^3.4.0",
118+
"selenium-webdriver": "^3.6.0",
118119
"sorcery": "^0.10.0",
119120
"stylelint": "^7.12.0",
120121
"ts-node": "^3.0.4",
121-
"tsconfig-paths": "^2.2.0",
122-
"tslint": "^5.7.0",
123-
"tsutils": "^2.6.0",
122+
"tsconfig-paths": "^2.3.0",
123+
"tslint": "^5.8.0",
124+
"tsutils": "^2.12.1",
124125
"typescript": "~2.4.2",
125126
"uglify-js": "^2.8.14"
126127
}

‎src/lib/api/core/base-adapter.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/core/base-adapter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/core/base.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
@@ -192,7 +192,9 @@ export abstract class BaseFxDirective implements OnDestroy, OnChanges {
192192
this._inputMap[prop] = source[prop];
193193
}
194194
} else {
195-
this._inputMap[key] = source;
195+
if (!!key) {
196+
this._inputMap[key] = source;
197+
}
196198
}
197199
}
198200

@@ -220,7 +222,7 @@ export abstract class BaseFxDirective implements OnDestroy, OnChanges {
220222
*/
221223
protected get childrenNodes() {
222224
const obj = this.nativeElement.children;
223-
const buffer = [];
225+
const buffer: any[] = [];
224226

225227
// iterate backwards ensuring that length is an UInt32
226228
for (let i = obj.length; i--; ) {

‎src/lib/api/core/renderer-adapter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/core/responsive-activation.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/core/responsive-activation.ts

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
88
import {Subscription} from 'rxjs/Subscription';
9-
import {map} from 'rxjs/operator/map';
9+
import {map} from 'rxjs/operators';
1010

1111
import {MediaChange, MediaQuerySubscriber} from '../../media-query/media-change';
1212
import {BreakPoint} from '../../media-query/breakpoints/break-point';
@@ -117,7 +117,7 @@ export class ResponsiveActivation {
117117
* Cache 1..n subscriptions for internal auto-unsubscribes when the the directive destructs
118118
*/
119119
private _configureChangeObservers(): SubscriptionList {
120-
let subscriptions = [];
120+
let subscriptions: Subscription[] = [];
121121

122122
this._registryMap.forEach((bp: BreakPointX) => {
123123
if (this._keyInUse(bp.key)) {
@@ -130,10 +130,10 @@ export class ResponsiveActivation {
130130
};
131131

132132
subscriptions.push(
133-
map.call(this.mediaMonitor.observe(bp.alias), buildChanges)
134-
.subscribe(change => {
135-
this._onMonitorEvents(change);
136-
})
133+
this.mediaMonitor.observe(bp.alias).pipe(map(buildChanges))
134+
.subscribe(change => {
135+
this._onMonitorEvents(change);
136+
})
137137
);
138138
}
139139
});
@@ -188,7 +188,7 @@ export class ResponsiveActivation {
188188
const currentKey = this._options.baseKey + current.suffix; // e.g. suffix == 'GtSm',
189189
let newKey = this._activatedInputKey; // e.g. newKey == hideGtSm
190190

191-
newKey = current.matches ? currentKey : ((newKey == currentKey) ? null : newKey);
191+
newKey = current.matches ? currentKey : ((newKey == currentKey) ? '' : newKey);
192192

193193
this._activatedInputKey = this._validateInputKey(newKey);
194194
return this.activatedInput;
@@ -201,11 +201,10 @@ export class ResponsiveActivation {
201201
* NOTE: scans in the order defined by activeOverLaps (largest viewport ranges -> smallest ranges)
202202
*/
203203
private _validateInputKey(inputKey) {
204-
let items: BreakPoint[] = this.mediaMonitor.activeOverlaps;
205204
let isMissingKey = (key) => !this._keyInUse(key);
206205

207206
if (isMissingKey(inputKey)) {
208-
items.some(bp => {
207+
this.mediaMonitor.activeOverlaps.some(bp => {
209208
let key = this._options.baseKey + bp.suffix;
210209
if (!isMissingKey(key)) {
211210
inputKey = key;

‎src/lib/api/ext/class.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/ext/class.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/ext/hide.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/ext/img-src.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/ext/img-src.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/ext/show-hide.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/ext/show.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/ext/style.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/ext/style.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/flexbox/flex-align.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/flexbox/flex-fill.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/flexbox/flex-offset.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/flexbox/flex-offset.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/flexbox/flex-order.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/flexbox/flex.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

‎src/lib/api/flexbox/flex.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
@@ -50,7 +50,7 @@ export type FlexBasisAlias = 'grow' | 'initial' | 'auto' | 'none' | 'nogrow' | '
5050
export class FlexDirective extends BaseFxDirective implements OnInit, OnChanges, OnDestroy {
5151

5252
/** The flex-direction of this element's flex container. Defaults to 'row'. */
53-
protected _layout = 'row';
53+
protected _layout: string;
5454

5555
/**
5656
* Subscription to the parent flex container's layout changes.

‎src/lib/api/flexbox/layout-align.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

0 commit comments

Comments
 (0)