Skip to content

Commit ffa913c

Browse files
committed
fixed components for angular 9 support
1 parent 5091909 commit ffa913c

File tree

59 files changed

+158
-96
lines changed

Some content is hidden

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

59 files changed

+158
-96
lines changed

.idea/workspace.xml

Lines changed: 72 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

projects/ng-metro4/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "ng-metro4",
33
"description": "Angular components for Metro4 UI library in modern ui style.",
4-
"version": "1.0.10",
4+
"version": "2.0.0",
55
"peerDependencies": {
6-
"@angular/common": "~8.1.0",
7-
"@angular/core": "~8.1.0",
6+
"@angular/common": "~9.0.1",
7+
"@angular/core": "~9.0.1",
88
"moment": "^2.24.0",
99
"metro4": "4.3.5",
10-
"rxjs": "~6.5.2"
10+
"rxjs": "~6.5.4"
1111
},
1212
"schematics": "./schematics/collection.json",
1313
"keywords": [

projects/ng-metro4/src/lib/form/calendar-picker/calendar-picker.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<input type="text" #input
2-
[ngClass]="class"
2+
33
data-input-format="%m/%d/%Y"
44

55
[attr.data-calendar-wide]="calendarWide"

projects/ng-metro4/src/lib/form/calendar-picker/calendar-picker.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ declare var $: any;
1818
changeDetection: ChangeDetectionStrategy.OnPush
1919
})
2020
export class CalendarPickerComponent extends ControlBase<moment.Moment> {
21-
@Input('class') class: string;
21+
2222
@Input('calendar-wide') calendarWide: boolean;
2323
@Input('calendar-wide-point') calendarWidePoint: WidePointType;
2424
@Input('dialog-mode') dialogMode: boolean;

projects/ng-metro4/src/lib/form/calendar/calendar.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div #object
2-
[ngClass]="class"
2+
33

44
[attr.data-years-before]="yearsBefore"
55
[attr.data-years-after]="yearsAfter"

projects/ng-metro4/src/lib/form/calendar/calendar.component.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import (once) '~metro4/source/include/vars';
2-
@import (once) '~metro4/source/include/mixins';
1+
@import (once) 'node_modules/metro4/source/include/vars';
2+
@import (once) 'node_modules/metro4/source/include/mixins';
33

44
.calendar {
55
each(@accentColors, {

projects/ng-metro4/src/lib/form/calendar/calendar.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ declare var $: any;
1919
changeDetection: ChangeDetectionStrategy.OnPush
2020
})
2121
export class CalendarComponent extends ControlBase<moment.Moment|moment.Moment[]> {
22-
@Input('class') class: string;
22+
2323
@Input('years-before') yearsBefore: number;
2424
@Input('years-after') yearsAfter: number;
2525
@Input('show') show: moment.Moment;

projects/ng-metro4/src/lib/form/checkbox-group/checkbox-group.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<ng-container *ngIf="options; else noOptions">
2-
<m4-checkbox *ngFor="let option of options | objectKeys" [value]="options[option]" [caption]="option" [class]="class"></m4-checkbox>
2+
<m4-checkbox *ngFor="let option of options | objectKeys" [value]="options[option]" [caption]="option"></m4-checkbox>
33
</ng-container>
44
<ng-template #noOptions>
55
<ng-content></ng-content>

projects/ng-metro4/src/lib/form/checkbox-group/checkbox-group.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {asapScheduler} from 'rxjs';
2323
changeDetection: ChangeDetectionStrategy.OnPush
2424
})
2525
export class CheckboxGroupComponent extends ControlBase<any[]> {
26-
@Input('class') class: string;
26+
2727
@Input() readonly = false;
2828
@Input() options: { [title: string]: any };
2929

projects/ng-metro4/src/lib/form/checkbox/checkbox.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<input type="checkbox" #input
2-
[ngClass]="class"
2+
33

44
[readonly]="readonly"
55

projects/ng-metro4/src/lib/form/checkbox/checkbox.component.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import (once) '~metro4/source/include/vars';
2-
@import (once) '~metro4/source/include/mixins';
1+
@import (once) 'node_modules/metro4/source/include/vars';
2+
@import (once) 'node_modules/metro4/source/include/mixins';
33

44
.checkbox {
55
each(@accentColors, {

projects/ng-metro4/src/lib/form/checkbox/checkbox.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ declare var $: any;
1616
encapsulation: ViewEncapsulation.None
1717
})
1818
export class CheckboxComponent extends ControlBase<boolean> {
19-
@Input('class') class: string;
19+
2020
@Input('value') value: any;
2121

2222
@Input('readonly') readonly = false;

projects/ng-metro4/src/lib/form/date-picker/date-picker.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<input type="text" #input
2-
[ngClass]="class"
2+
33

44
[attr.data-month]="month"
55
[attr.data-day]="day"

projects/ng-metro4/src/lib/form/date-picker/date-picker.component.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import (once) '~metro4/source/include/vars';
2-
@import (once) '~metro4/source/include/mixins';
1+
@import (once) 'node_modules/metro4/source/include/vars';
2+
@import (once) 'node_modules/metro4/source/include/mixins';
33

44
.date-picker {
55
each(@accentColors, {

projects/ng-metro4/src/lib/form/date-picker/date-picker.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ declare var $: any;
1717
encapsulation: ViewEncapsulation.None
1818
})
1919
export class DatePickerComponent extends ControlBase<moment.Moment> {
20-
@Input('class') class: string;
20+
2121
@Input('month') month: boolean;
2222
@Input('day') day: boolean;
2323
@Input('year') year: boolean;

projects/ng-metro4/src/lib/form/file-input/file-input.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<input type="file" #input
2-
[ngClass]="class"
2+
33

44
[accept]="accept"
55
[multiple]="multiple"

projects/ng-metro4/src/lib/form/file-input/file-input.component.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import (once) '~metro4/source/include/vars';
2-
@import (once) '~metro4/source/include/mixins';
1+
@import (once) 'node_modules/metro4/source/include/vars';
2+
@import (once) 'node_modules/metro4/source/include/mixins';
33

44
.drop-zone {
55
each(@accentColors, {

projects/ng-metro4/src/lib/form/file-input/file-input.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export interface FileEntry {
2121
encapsulation: ViewEncapsulation.None
2222
})
2323
export class FileInputComponent extends ControlBase<File | File[] | FileEntry | FileEntry[]> {
24-
@Input('class') class: string;
24+
2525
@Input('multiple') multiple = false;
2626
@Input('accept') accept = '';
2727
@Input('read') read: FileReadModeType = '';

0 commit comments

Comments
 (0)