Skip to content

Support for [class]="options?.htmlClass" #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 18, 2018
Merged

Support for [class]="options?.htmlClass" #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55398af
class binding with options?.fieldHtmlClass
Mar 7, 2018
3de8cbc
Merge pull request #1 from shamoons/master
Alex130 Jun 18, 2018
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
1 change: 1 addition & 0 deletions src/lib/src/framework-library/material-design-framework/material-add-reference.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service';
template: `
<section [class]="options?.htmlClass || ''" align="end">
<button mat-raised-button *ngIf="showAddButton"
[class]="options?.fieldHtmlClass"
[color]="options?.color || 'accent'"
[disabled]="options?.readonly"
(click)="addItem($event)">
Expand Down
1 change: 1 addition & 0 deletions src/lib/src/framework-library/material-design-framework/material-button-group.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { buildTitleMap } from '../../shared';
[innerHTML]="options?.title"></label>
</div>
<mat-button-toggle-group
[class]="options?.fieldHtmlClass"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.readonly]="options?.readonly ? 'readonly' : null"
[attr.required]="options?.required"
Expand Down
4 changes: 4 additions & 0 deletions src/lib/src/framework-library/material-design-framework/material-checkbox.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { hasOwn } from './../../shared/utility.functions';
selector: 'material-checkbox-widget',
template: `
<mat-checkbox *ngIf="boundControl && !showSlideToggle"
[class]="options?.htmlClass"
[formControl]="formControl"
align="left"
[color]="options?.color || 'primary'"
Expand All @@ -21,6 +22,7 @@ import { hasOwn } from './../../shared/utility.functions';
[innerHTML]="options?.title"></span>
</mat-checkbox>
<mat-checkbox *ngIf="!boundControl && !showSlideToggle"
[class]="options?.htmlClass"
align="left"
[color]="options?.color || 'primary'"
[disabled]="controlDisabled || options?.readonly"
Expand All @@ -37,6 +39,7 @@ import { hasOwn } from './../../shared/utility.functions';
</mat-checkbox>
<mat-slide-toggle *ngIf="boundControl && showSlideToggle"
[formControl]="formControl"
[class]="options?.htmlClass"
align="left"
[color]="options?.color || 'primary'"
[id]="'control' + layoutNode?._id"
Expand All @@ -50,6 +53,7 @@ import { hasOwn } from './../../shared/utility.functions';
</mat-slide-toggle>
<mat-slide-toggle *ngIf="!boundControl && showSlideToggle"
align="left"
[class]="options?.htmlClass"
[color]="options?.color || 'primary'"
[disabled]="controlDisabled || options?.readonly"
[id]="'control' + layoutNode?._id"
Expand Down
2 changes: 2 additions & 0 deletions src/lib/src/framework-library/material-design-framework/material-checkboxes.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { buildFormGroup, buildTitleMap, hasOwn, JsonPointer } from '../../shared
template: `
<div>
<mat-checkbox type="checkbox"
[class]="options?.htmlClass"
[checked]="allChecked"
[color]="options?.color || 'primary'"
[disabled]="controlDisabled || options?.readonly"
Expand All @@ -30,6 +31,7 @@ import { buildFormGroup, buildTitleMap, hasOwn, JsonPointer } from '../../shared
<li *ngFor="let checkboxItem of checkboxList"
[class]="options?.htmlClass || ''">
<mat-checkbox type="checkbox"
[class]="options?.htmlClass"
[(ngModel)]="checkboxItem.checked"
[color]="options?.color || 'primary'"
[disabled]="controlDisabled || options?.readonly"
Expand Down
2 changes: 2 additions & 0 deletions src/lib/src/framework-library/material-design-framework/material-datepicker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { dateToString, hasOwn, stringToDate } from '../../shared';
<span matPrefix *ngIf="options?.prefix || options?.fieldAddonLeft"
[innerHTML]="options?.prefix || options?.fieldAddonLeft"></span>
<input matInput *ngIf="boundControl"
[class]="options?.fieldHtmlClass"
[formControl]="formControl"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.list]="'control' + layoutNode?._id + 'Autocomplete'"
Expand All @@ -25,6 +26,7 @@ import { dateToString, hasOwn, stringToDate } from '../../shared';
[style.width]="'100%'"
(blur)="options.showErrors = true">
<input matInput *ngIf="!boundControl"
[class]="options?.fieldHtmlClass"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.list]="'control' + layoutNode?._id + 'Autocomplete'"
[attr.readonly]="options?.readonly ? 'readonly' : null"
Expand Down
2 changes: 2 additions & 0 deletions src/lib/src/framework-library/material-design-framework/material-input.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service';
<span matPrefix *ngIf="options?.prefix || options?.fieldAddonLeft"
[innerHTML]="options?.prefix || options?.fieldAddonLeft"></span>
<input matInput *ngIf="boundControl"
[class]="options?.fieldHtmlClass"
[formControl]="formControl"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.list]="'control' + layoutNode?._id + 'Autocomplete'"
Expand All @@ -28,6 +29,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service';
[type]="layoutNode?.type"
(blur)="options.showErrors = true">
<input matInput *ngIf="!boundControl"
[class]="options?.fieldHtmlClass"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.list]="'control' + layoutNode?._id + 'Autocomplete'"
[attr.maxlength]="options?.maxLength"
Expand Down
2 changes: 2 additions & 0 deletions src/lib/src/framework-library/material-design-framework/material-number.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service';
<span matPrefix *ngIf="options?.prefix || options?.fieldAddonLeft"
[innerHTML]="options?.prefix || options?.fieldAddonLeft"></span>
<input matInput *ngIf="boundControl"
[class]="options?.fieldHtmlClass"
[formControl]="formControl"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.max]="options?.maximum"
Expand All @@ -27,6 +28,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service';
[type]="'number'"
(blur)="options.showErrors = true">
<input matInput *ngIf="!boundControl"
[class]="options?.fieldHtmlClass"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.max]="options?.maximum"
[attr.min]="options?.minimum"
Expand Down
2 changes: 2 additions & 0 deletions src/lib/src/framework-library/material-design-framework/material-radios.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { buildTitleMap } from '../../shared';
[innerHTML]="options?.title"></label>
</div>
<mat-radio-group *ngIf="boundControl"
[class]="options?.fieldHtmlClass"
[formControl]="formControl"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.readonly]="options?.readonly ? 'readonly' : null"
Expand All @@ -30,6 +31,7 @@ import { buildTitleMap } from '../../shared';
</mat-radio-button>
</mat-radio-group>
<mat-radio-group *ngIf="!boundControl"
[class]="options?.fieldHtmlClass"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.readonly]="options?.readonly ? 'readonly' : null"
[attr.required]="options?.required"
Expand Down
2 changes: 2 additions & 0 deletions src/lib/src/framework-library/material-design-framework/material-select.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { buildTitleMap, isArray } from '../../shared';
<span matPrefix *ngIf="options?.prefix || options?.fieldAddonLeft"
[innerHTML]="options?.prefix || options?.fieldAddonLeft"></span>
<mat-select *ngIf="boundControl"
[class]="options?.fieldHtmlClass"
[formControl]="formControl"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.name]="controlName"
Expand All @@ -38,6 +39,7 @@ import { buildTitleMap, isArray } from '../../shared';
</ng-template>
</mat-select>
<mat-select *ngIf="!boundControl"
[class]="options?.fieldHtmlClass"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.name]="controlName"
[disabled]="controlDisabled || options?.readonly"
Expand Down
2 changes: 2 additions & 0 deletions src/lib/src/framework-library/material-design-framework/material-slider.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service';
selector: 'material-slider-widget',
template: `
<mat-slider thumbLabel *ngIf="boundControl"
[class]="options?.fieldHtmlClass"
[formControl]="formControl"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[id]="'control' + layoutNode?._id"
Expand All @@ -16,6 +17,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service';
[style.width]="'100%'"
(blur)="options.showErrors = true"></mat-slider>
<mat-slider thumbLabel *ngIf="!boundControl"
[class]="options?.fieldHtmlClass"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[disabled]="controlDisabled || options?.readonly"
[id]="'control' + layoutNode?._id"
Expand Down
2 changes: 2 additions & 0 deletions src/lib/src/framework-library/material-design-framework/material-textarea.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service';
<span matPrefix *ngIf="options?.prefix || options?.fieldAddonLeft"
[innerHTML]="options?.prefix || options?.fieldAddonLeft"></span>
<textarea matInput *ngIf="boundControl"
[class]="options?.fieldHtmlClass"
[formControl]="formControl"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.list]="'control' + layoutNode?._id + 'Autocomplete'"
Expand All @@ -27,6 +28,7 @@ import { JsonSchemaFormService } from '../../json-schema-form.service';
[style.width]="'100%'"
(blur)="options.showErrors = true"></textarea>
<textarea matInput *ngIf="!boundControl"
[class]="options?.fieldHtmlClass"
[attr.aria-describedby]="'control' + layoutNode?._id + 'Status'"
[attr.list]="'control' + layoutNode?._id + 'Autocomplete'"
[attr.maxlength]="options?.maxLength"
Expand Down