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

fix(universal): correct fxLayout rendering, update LICENSE #466

Closed
wants to merge 1 commit into from
Closed

fix(universal): correct fxLayout rendering, update LICENSE #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright (c) 2017 Google, Inc.
Copyright (c) 2017 Google LLC.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion build-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const buildVersion = require('./package.json').version;
/** License that will be placed inside of all created bundles. */
const buildLicense = `/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
67 changes: 34 additions & 33 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,58 +26,59 @@
"node": ">= 5.4.1 <= 8"
},
"dependencies": {
"@angular/common": "~4.4.4",
"@angular/compiler": "~4.4.4",
"@angular/core": "~4.4.4",
"@angular/platform-browser": "~4.4.4",
"core-js": "^2.4.1",
"rxjs": "^5.4.2",

"@angular/common": "^4.4.6",
"@angular/compiler": "^4.4.6",
"@angular/core": "^4.4.6",
"@angular/platform-browser": "^4.4.6",
"core-js": "^2.5.1",
"rxjs": "^5.5.0",
"systemjs": "0.19.43",
"tsickle": "^0.23.5",
"tslib": "^1.7.1",
"zone.js": "^0.8.12"
"tslib": "^1.8.0",
"zone.js": "^0.8.18"
},
"devDependencies": {
"@angular/animations": "~4.4.4",
"@angular/animations": "^4.4.6",
"@angular/cdk": "^2.0.0-beta.12",
"@angular/compiler-cli": "~4.4.4",
"@angular/forms": "~4.4.4",
"@angular/http": "~4.4.4",
"@angular/compiler-cli": "^4.4.6",
"@angular/forms": "^4.4.6",
"@angular/http": "^4.4.6",
"@angular/material": "^2.0.0-beta.12",
"@angular/platform-browser-dynamic": "~4.4.4",
"@angular/platform-server": "~4.4.4",
"@angular/router": "~4.4.4",
"@angular/tsc-wrapped": "~4.4.4",
"@google-cloud/storage": "^1.1.1",
"@angular/platform-browser-dynamic": "^4.4.6",
"@angular/platform-server": "^4.4.6",
"@angular/router": "^4.4.6",
"@angular/tsc-wrapped": "^4.4.6",
"@google-cloud/storage": "^1.4.0",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^3.0.1",
"@types/glob": "^5.0.30",
"@types/glob": "^5.0.33",
"@types/gulp": "3.8.32",
"@types/hammerjs": "^2.0.34",
"@types/jasmine": "2.5.45",
"@types/merge2": "^0.3.30",
"@types/minimist": "^1.2.0",
"@types/node": "^7.0.21",
"@types/node": "^7.0.46",
"@types/run-sequence": "^0.0.29",
"@types/rx": "2.5.33",
"axe-core": "^2.3.1",
"axe-webdriverjs": "^1.1.1",
"axe-core": "^2.4.2",
"axe-webdriverjs": "^1.1.5",
"chalk": "^1.1.3",
"cli-color": "^1.2.0",
"dgeni": "^0.4.7",
"dgeni-packages": "^0.19.1",
"firebase": "^4.0.0",
"firebase-admin": "^5.0.0",
"firebase-tools": "^3.11.0",
"firebase": "^4.6.0",
"firebase-admin": "^5.4.2",
"firebase-tools": "^3.13.1",
"fs-extra": "^3.0.1",
"glob": "^7.1.2",
"google-closure-compiler": "20170409.0.0",
"gulp": "^3.9.1",
"gulp-clean": "^0.3.2",
"gulp-clean-css": "^3.3.1",
"gulp-clean-css": "^3.9.0",
"gulp-cli": "^1.3.0",
"gulp-connect": "^5.0.0",
"gulp-conventional-changelog": "^1.1.3",
"gulp-conventional-changelog": "^1.1.6",
"gulp-dom": "^0.9.17",
"gulp-flatten": "^0.3.1",
"gulp-highlight-files": "^0.0.5",
Expand Down Expand Up @@ -106,21 +107,21 @@
"minimatch": "^3.0.4",
"minimist": "^1.2.0",
"prompt-sync": "^4.1.5",
"protractor": "^5.1.2",
"request": "^2.81.0",
"protractor": "^5.2.0",
"request": "^2.83.0",
"resolve-bin": "^0.4.0",
"rollup": "^0.41.6",
"rollup-plugin-alias": "^1.3.1",
"rollup-plugin-alias": "^1.4.0",
"rollup-plugin-node-resolve": "^3.0.0",
"run-sequence": "^1.2.2",
"scss-bundle": "^2.0.1-beta.7",
"selenium-webdriver": "^3.4.0",
"selenium-webdriver": "^3.6.0",
"sorcery": "^0.10.0",
"stylelint": "^7.12.0",
"ts-node": "^3.0.4",
"tsconfig-paths": "^2.2.0",
"tslint": "^5.7.0",
"tsutils": "^2.6.0",
"tsconfig-paths": "^2.3.0",
"tslint": "^5.8.0",
"tsutils": "^2.12.1",
"typescript": "~2.4.2",
"uglify-js": "^2.8.14"
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/core/base-adapter.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/core/base-adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
8 changes: 5 additions & 3 deletions src/lib/api/core/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down Expand Up @@ -192,7 +192,9 @@ export abstract class BaseFxDirective implements OnDestroy, OnChanges {
this._inputMap[prop] = source[prop];
}
} else {
this._inputMap[key] = source;
if (!!key) {
this._inputMap[key] = source;
}
}
}

Expand Down Expand Up @@ -220,7 +222,7 @@ export abstract class BaseFxDirective implements OnDestroy, OnChanges {
*/
protected get childrenNodes() {
const obj = this.nativeElement.children;
const buffer = [];
const buffer: any[] = [];

// iterate backwards ensuring that length is an UInt32
for (let i = obj.length; i--; ) {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/core/renderer-adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/core/responsive-activation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
19 changes: 9 additions & 10 deletions src/lib/api/core/responsive-activation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import {Subscription} from 'rxjs/Subscription';
import {map} from 'rxjs/operator/map';
import {map} from 'rxjs/operators';

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

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

subscriptions.push(
map.call(this.mediaMonitor.observe(bp.alias), buildChanges)
.subscribe(change => {
this._onMonitorEvents(change);
})
this.mediaMonitor.observe(bp.alias).pipe(map(buildChanges))
.subscribe(change => {
this._onMonitorEvents(change);
})
);
}
});
Expand Down Expand Up @@ -188,7 +188,7 @@ export class ResponsiveActivation {
const currentKey = this._options.baseKey + current.suffix; // e.g. suffix == 'GtSm',
let newKey = this._activatedInputKey; // e.g. newKey == hideGtSm

newKey = current.matches ? currentKey : ((newKey == currentKey) ? null : newKey);
newKey = current.matches ? currentKey : ((newKey == currentKey) ? '' : newKey);

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

if (isMissingKey(inputKey)) {
items.some(bp => {
this.mediaMonitor.activeOverlaps.some(bp => {
let key = this._options.baseKey + bp.suffix;
if (!isMissingKey(key)) {
inputKey = key;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/ext/class.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/ext/class.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/ext/hide.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/ext/img-src.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/ext/img-src.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/ext/show-hide.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/ext/show.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/ext/style.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/ext/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/flexbox/flex-align.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/flexbox/flex-fill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/flexbox/flex-offset.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/flexbox/flex-offset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/flexbox/flex-order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/flexbox/flex.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
4 changes: 2 additions & 2 deletions src/lib/api/flexbox/flex.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down Expand Up @@ -50,7 +50,7 @@ export type FlexBasisAlias = 'grow' | 'initial' | 'auto' | 'none' | 'nogrow' | '
export class FlexDirective extends BaseFxDirective implements OnInit, OnChanges, OnDestroy {

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

/**
* Subscription to the parent flex container's layout changes.
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/flexbox/layout-align.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
Expand Down
Loading