From c2be13eace43110ef66f7d2caeba700c543c6b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20=C3=87ivici?= Date: Mon, 12 Sep 2016 19:34:07 +0300 Subject: [PATCH] Fixed #883 --- components/autocomplete/autocomplete.ts | 4 ++++ components/calendar/calendar.ts | 4 ++++ components/checkbox/checkbox.ts | 4 ++++ components/dropdown/dropdown.ts | 4 ++++ components/inputmask/inputmask.ts | 4 ++++ components/inputswitch/inputswitch.ts | 4 ++++ components/listbox/listbox.ts | 6 +++++- components/multiselect/multiselect.ts | 4 ++++ components/radiobutton/radiobutton.ts | 4 ++++ components/rating/rating.ts | 4 ++++ components/selectbutton/selectbutton.ts | 4 ++++ components/slider/slider.ts | 4 ++++ components/spinner/spinner.ts | 4 ++++ components/togglebutton/togglebutton.ts | 4 ++++ 14 files changed, 57 insertions(+), 1 deletion(-) diff --git a/components/autocomplete/autocomplete.ts b/components/autocomplete/autocomplete.ts index 15cbf99f4a0..41e64b847c9 100644 --- a/components/autocomplete/autocomplete.ts +++ b/components/autocomplete/autocomplete.ts @@ -171,6 +171,10 @@ export class AutoComplete implements AfterViewInit,DoCheck,AfterViewChecked,Cont this.onModelTouched = fn; } + setDisabledState(val: boolean): void { + this.disabled = val; + } + onInput(event) { let value = event.target.value; if(!this.multiple) { diff --git a/components/calendar/calendar.ts b/components/calendar/calendar.ts index c4b37829129..dce1e290ef8 100644 --- a/components/calendar/calendar.ts +++ b/components/calendar/calendar.ts @@ -215,6 +215,10 @@ export class Calendar implements AfterViewInit,OnChanges,OnDestroy,ControlValueA registerOnTouched(fn: Function): void { this.onModelTouched = fn; } + + setDisabledState(val: boolean): void { + this.disabled = val; + } ngOnChanges(changes: {[key: string]: SimpleChange}) { if (this.initialized) { diff --git a/components/checkbox/checkbox.ts b/components/checkbox/checkbox.ts index 91a503dfe88..9f0d0f23b2a 100644 --- a/components/checkbox/checkbox.ts +++ b/components/checkbox/checkbox.ts @@ -133,6 +133,10 @@ export class Checkbox implements ControlValueAccessor { registerOnTouched(fn: Function): void { this.onModelTouched = fn; } + + setDisabledState(val: boolean): void { + this.disabled = val; + } } @NgModule({ diff --git a/components/dropdown/dropdown.ts b/components/dropdown/dropdown.ts index a3c4a3d5148..fa403d2f91a 100644 --- a/components/dropdown/dropdown.ts +++ b/components/dropdown/dropdown.ts @@ -216,6 +216,10 @@ export class Dropdown implements OnInit,AfterViewInit,AfterViewChecked,DoCheck,O registerOnTouched(fn: Function): void { this.onModelTouched = fn; } + + setDisabledState(val: boolean): void { + this.disabled = val; + } updateDimensions() { if(this.autoWidth) { diff --git a/components/inputmask/inputmask.ts b/components/inputmask/inputmask.ts index b46cc53b8aa..6a0f43523a7 100644 --- a/components/inputmask/inputmask.ts +++ b/components/inputmask/inputmask.ts @@ -119,6 +119,10 @@ export class InputMask implements AfterViewInit,OnDestroy,ControlValueAccessor { this.onModelTouched = fn; } + setDisabledState(val: boolean): void { + this.disabled = val; + } + onBlur() { this.onModelTouched(); } diff --git a/components/inputswitch/inputswitch.ts b/components/inputswitch/inputswitch.ts index 6128ed88b00..915708337cd 100644 --- a/components/inputswitch/inputswitch.ts +++ b/components/inputswitch/inputswitch.ts @@ -174,6 +174,10 @@ export class InputSwitch implements ControlValueAccessor, AfterViewInit { registerOnTouched(fn: Function): void { this.onModelTouched = fn; } + + setDisabledState(val: boolean): void { + this.disabled = val; + } } @NgModule({ diff --git a/components/listbox/listbox.ts b/components/listbox/listbox.ts index 0ac344635c6..7c454f92f2e 100644 --- a/components/listbox/listbox.ts +++ b/components/listbox/listbox.ts @@ -37,7 +37,7 @@ export class Listbox implements ControlValueAccessor { @Input() styleClass: string; - @Input() disabled: string; + @Input() disabled: boolean; @Output() onChange: EventEmitter = new EventEmitter(); @@ -66,6 +66,10 @@ export class Listbox implements ControlValueAccessor { registerOnTouched(fn: Function): void { this.onModelTouched = fn; } + + setDisabledState(val: boolean): void { + this.disabled = val; + } onOptionClick(event, option) { let metaKey = (event.metaKey||event.ctrlKey); diff --git a/components/multiselect/multiselect.ts b/components/multiselect/multiselect.ts index 94ad11f3d97..c0e511fe83b 100644 --- a/components/multiselect/multiselect.ts +++ b/components/multiselect/multiselect.ts @@ -168,6 +168,10 @@ export class MultiSelect implements OnInit,AfterViewInit,AfterViewChecked,DoChec this.onModelTouched = fn; } + setDisabledState(val: boolean): void { + this.disabled = val; + } + onItemClick(event, value) { let selectionIndex = this.findSelectionIndex(value); if(selectionIndex != -1) { diff --git a/components/radiobutton/radiobutton.ts b/components/radiobutton/radiobutton.ts index 674402d67f7..68e7024f3f7 100644 --- a/components/radiobutton/radiobutton.ts +++ b/components/radiobutton/radiobutton.ts @@ -74,6 +74,10 @@ export class RadioButton implements ControlValueAccessor { registerOnTouched(fn: Function): void { this.onModelTouched = fn; } + + setDisabledState(val: boolean): void { + this.disabled = val; + } } @NgModule({ diff --git a/components/rating/rating.ts b/components/rating/rating.ts index 65cb0f5d3ac..1e7ab6c5ce1 100644 --- a/components/rating/rating.ts +++ b/components/rating/rating.ts @@ -83,6 +83,10 @@ export class Rating implements ControlValueAccessor { registerOnTouched(fn: Function): void { this.onModelTouched = fn; } + + setDisabledState(val: boolean): void { + this.disabled = val; + } } @NgModule({ diff --git a/components/selectbutton/selectbutton.ts b/components/selectbutton/selectbutton.ts index 008506eb075..33b9d0f8044 100644 --- a/components/selectbutton/selectbutton.ts +++ b/components/selectbutton/selectbutton.ts @@ -58,6 +58,10 @@ export class SelectButton implements ControlValueAccessor { this.onModelTouched = fn; } + setDisabledState(val: boolean): void { + this.disabled = val; + } + onItemClick(event, option: SelectItem) { if(this.disabled) { return; diff --git a/components/slider/slider.ts b/components/slider/slider.ts index 5e464a26090..318c037f002 100644 --- a/components/slider/slider.ts +++ b/components/slider/slider.ts @@ -96,6 +96,10 @@ export class Slider implements AfterViewInit,OnDestroy,OnChanges,ControlValueAcc registerOnTouched(fn: Function): void { this.onModelTouched = fn; } + + setDisabledState(val: boolean): void { + this.disabled = val; + } ngOnChanges(changes: { [key: string]: SimpleChange }) { if (this.initialized) { diff --git a/components/spinner/spinner.ts b/components/spinner/spinner.ts index 19a4ac78c4b..c4202397631 100644 --- a/components/spinner/spinner.ts +++ b/components/spinner/spinner.ts @@ -264,6 +264,10 @@ export class Spinner implements AfterViewInit,ControlValueAccessor { registerOnTouched(fn: Function): void { this.onModelTouched = fn; } + + setDisabledState(val: boolean): void { + this.disabled = val; + } } diff --git a/components/togglebutton/togglebutton.ts b/components/togglebutton/togglebutton.ts index 94f13890613..1ea8b3be930 100644 --- a/components/togglebutton/togglebutton.ts +++ b/components/togglebutton/togglebutton.ts @@ -74,6 +74,10 @@ export class ToggleButton implements ControlValueAccessor { registerOnTouched(fn: Function): void { this.onModelTouched = fn; } + + setDisabledState(val: boolean): void { + this.disabled = val; + } } @NgModule({