From e819d6a34a63c4737ad8a213d8710930a27ced5b Mon Sep 17 00:00:00 2001 From: Jan Lohage Date: Tue, 13 Mar 2018 11:58:20 +0100 Subject: [PATCH 1/2] move fxLayoutWrap to fxLayout --- .../flex-layout-section.component.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/src/framework-library/material-design-framework/flex-layout-section.component.ts b/src/lib/src/framework-library/material-design-framework/flex-layout-section.component.ts index e1152aae..5035ec5e 100755 --- a/src/lib/src/framework-library/material-design-framework/flex-layout-section.component.ts +++ b/src/lib/src/framework-library/material-design-framework/flex-layout-section.component.ts @@ -28,8 +28,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service'; [style.justify-content]="getFlexAttribute('justify-content')" [style.align-items]="getFlexAttribute('align-items')" [style.align-content]="getFlexAttribute('align-content')" - [fxLayout]="options?.fxLayout" - [fxLayoutWrap]="options?.fxLayoutWrap" + [fxLayout]="getFlexAttribute('layout')" [fxLayoutGap]="options?.fxLayoutGap" [fxLayoutAlign]="options?.fxLayoutAlign" [attr.fxFlexFill]="options?.fxLayoutAlign"> @@ -59,8 +58,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service'; [style.justify-content]="getFlexAttribute('justify-content')" [style.align-items]="getFlexAttribute('align-items')" [style.align-content]="getFlexAttribute('align-content')" - [fxLayout]="options?.fxLayout" - [fxLayoutWrap]="options?.fxLayoutWrap" + [fxLayout]="getFlexAttribute('layout')" [fxLayoutGap]="options?.fxLayoutGap" [fxLayoutAlign]="options?.fxLayoutAlign" [attr.fxFlexFill]="options?.fxLayoutAlign"> @@ -93,8 +91,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service'; [style.justify-content]="getFlexAttribute('justify-content')" [style.align-items]="getFlexAttribute('align-items')" [style.align-content]="getFlexAttribute('align-content')" - [fxLayout]="options?.fxLayout" - [fxLayoutWrap]="options?.fxLayoutWrap" + [fxLayout]="getFlexAttribute('layout')" [fxLayoutGap]="options?.fxLayoutGap" [fxLayoutAlign]="options?.fxLayoutAlign" [attr.fxFlexFill]="options?.fxLayoutAlign"> @@ -131,8 +128,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service'; [style.justify-content]="getFlexAttribute('justify-content')" [style.align-items]="getFlexAttribute('align-items')" [style.align-content]="getFlexAttribute('align-content')" - [fxLayout]="options?.fxLayout" - [fxLayoutWrap]="options?.fxLayoutWrap" + [fxLayout]="getFlexAttribute('layout')" [fxLayoutGap]="options?.fxLayoutGap" [fxLayoutAlign]="options?.fxLayoutAlign" [attr.fxFlexFill]="options?.fxLayoutAlign"> @@ -212,6 +208,10 @@ export class FlexLayoutSectionComponent implements OnInit { this.options[attribute] || ['column', 'nowrap'][index]; case 'justify-content': case 'align-items': case 'align-content': return this.options[attribute]; + case 'layout': + return (this.options.fxLayout || 'row') + + this.options.fxLayoutWrap ? ' ' : '' + + this.options.fxLayoutWrap; } } } From 4e9e06a1c730bbdd9b031bf0133a8077d9a5a6fe Mon Sep 17 00:00:00 2001 From: Jan Lohage Date: Tue, 13 Mar 2018 12:03:01 +0100 Subject: [PATCH 2/2] Update flex-layout-section.component.ts --- .../material-design-framework/flex-layout-section.component.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/src/framework-library/material-design-framework/flex-layout-section.component.ts b/src/lib/src/framework-library/material-design-framework/flex-layout-section.component.ts index 5035ec5e..6b89bc89 100755 --- a/src/lib/src/framework-library/material-design-framework/flex-layout-section.component.ts +++ b/src/lib/src/framework-library/material-design-framework/flex-layout-section.component.ts @@ -210,8 +210,7 @@ export class FlexLayoutSectionComponent implements OnInit { return this.options[attribute]; case 'layout': return (this.options.fxLayout || 'row') + - this.options.fxLayoutWrap ? ' ' : '' + - this.options.fxLayoutWrap; + this.options.fxLayoutWrap ? ' ' + this.options.fxLayoutWrap : ''; } } }