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

fix(FlexLayoutModule): remove console.warn() calls that conflict with ngc+aot #179

Merged
merged 1 commit into from
Feb 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
### BREAKING CHANGES

* ObservableMedia: Deprecated use of `ObservableMediaService` opaque token. Developers now simply use the ObservableMedia class to inject the service.
* FlexLayoutModule: Previously releases used FlexLayoutModule.forRoot(). This has been deprecated; and a console warning will be issued if used.
* FlexLayoutModule: Previously releases used FlexLayoutModule.forRoot(); This has been deprecated.

*before*

Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
"node": ">= 5.4.1 < 7"
},
"dependencies": {
"@angular/common": "^2.2.3",
"@angular/compiler": "^2.2.3",
"@angular/core": "^2.2.3",
"@angular/platform-browser": "^2.2.3",
"@angular/platform-browser-dynamic": "^2.2.3",
"@angular/common": "^2.3.1",
"@angular/compiler": "^2.3.1",
"@angular/core": "^2.3.1",
"@angular/platform-browser": "^2.3.1",
"@angular/platform-browser-dynamic": "^2.3.1",
"@types/gulp-util": "^3.0.30",
"core-js": "^2.4.1",
"reflect-metadata": "^0.1.8",
Expand All @@ -49,11 +49,11 @@
"zone.js": "^0.7.2"
},
"devDependencies": {
"@angular/compiler-cli": "^2.2.3",
"@angular/forms": "^2.2.3",
"@angular/http": "^2.2.3",
"@angular/compiler-cli": "^2.3.1",
"@angular/forms": "^2.3.1",
"@angular/http": "^2.3.1",
"@angular/material": "2.0.0-beta.0",
"@angular/platform-server": "^2.2.3",
"@angular/platform-server": "^2.3.1",
"@angular/router": "~3.1.1",
"@angular/tsc-wrapped": "~0.4.0",
"@angularclass/conventions-loader": "^1.0.2",
Expand Down
19 changes: 9 additions & 10 deletions src/demo-app/app/docs-layout/DemosLayoutAPI.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component } from '@angular/core';
import {Component} from '@angular/core';

@Component({
selector: 'demos-docs-layout',
template: `
selector: 'demos-docs-layout',
template: `
<demo-layout-alignment class="small-demo"> </demo-layout-alignment>
<demo-layout-fill class="small-demo"> </demo-layout-fill>
<demo-flex-row-fill class="small-demo"> </demo-flex-row-fill>
Expand All @@ -12,15 +12,15 @@ import { Component } from '@angular/core';
<demo-flex-offset-values class="small-demo"> </demo-flex-offset-values>
`
})
export class DemosLayoutAPI { }
export class DemosLayoutAPI {
}

import {NgModule} from '@angular/core';
import {CommonModule} from "@angular/common";
import {FormsModule} from "@angular/forms";
import {MaterialModule} from "@angular/material";
import {FlexLayoutModule} from "../../../lib"; // `gulp build:components` to deploy to node_modules manually


import {DemoLayoutAlignment} from "./layoutAlignment.demo";
import {DemoFlexRowFill} from "./flexRowFill.demo";
import {DemoFlexRowFillWrap} from "./flexRowFillWrap.demo";
Expand All @@ -29,9 +29,8 @@ import {DemoFlexOffsetValues} from "./flexOffetValues.demo";
import {DemoLayoutFill} from "./layoutFill.demo";
import {DemoFlexAlignSelf} from "./FlexAlignSelf.demo";


@NgModule({
declarations : [
declarations: [
DemosLayoutAPI, // used by the Router with the root app component

DemoFlexRowFill,
Expand All @@ -42,12 +41,12 @@ import {DemoFlexAlignSelf} from "./FlexAlignSelf.demo";
DemoLayoutFill,
DemoFlexAlignSelf
],
imports : [
imports: [
CommonModule,
FormsModule,
MaterialModule,
FlexLayoutModule
]

})
export class DemosLayoutAPIModule { }
export class DemosLayoutAPIModule {
}
3 changes: 1 addition & 2 deletions src/lib/flexbox/_module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,11 @@ const ALL_DIRECTIVES = [
declarations: ALL_DIRECTIVES,
imports: [MediaQueriesModule],
exports: [MediaQueriesModule, ...ALL_DIRECTIVES],
providers: [ MediaMonitor ]
providers: [MediaMonitor]
})
export class FlexLayoutModule {
/** @deprecated */
static forRoot(): ModuleWithProviders {
console.warn('FlexLayoutModule.forRoot() has been deprecated and is no longer needed.');
return {
ngModule: FlexLayoutModule
};
Expand Down
6 changes: 3 additions & 3 deletions tools/scripts/release/npm_assets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Gitter](https://badges.gitter.im/angular/flex-layout.svg)](https://gitter.im/angular/flex-layout))

Angular Flex Layout provides a sophisticated layout API using FlexBox CSS + mediaQuery.
This module provides Angular (v2.x and higher) developers with component layout features using a
This module provides Angular (v2.3.1 and higher) developers with component layout features using a
custom Layout API, mediaQuery observables,and injected DOM flexbox-2016 css stylings.

The Layout engine intelligently automates the process of applying appropriate FlexBox CSS to
Expand All @@ -26,10 +26,10 @@ While other Flexbox CSS libraries are implementations of:
Angular Flex Layout - in contrast - is a pure-Typescript UI Layout engine with an implementation that:

* uses HTML attributes (aka Layout API) to specify the layout configurations
* is currently only available for Angular (v2.x or higher) Applications.
* is currently only available for Angular (v2.4.3 or higher) Applications.
* is independent of Angular Material (v1 or v2).
* requires no external stylesheets.
* requires Angular v2.x or higher.
* requires Angular v2.4.3 or higher.

<br/>

Expand Down