Skip to content

Commit 896965f

Browse files
Merge branch '16.1.x' into ikitanov/fix-#14044-16.1.x
2 parents 6c61491 + 16195e3 commit 896965f

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

projects/igniteui-angular/src/lib/directives/date-time-editor/date-time-editor.directive.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
9090
@Input()
9191
public set minValue(value: string | Date) {
9292
this._minValue = value;
93-
this.onValidatorChange();
93+
this._onValidatorChange();
9494
}
9595

9696
/**
@@ -111,7 +111,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
111111
@Input()
112112
public set maxValue(value: string | Date) {
113113
this._maxValue = value;
114-
this.onValidatorChange();
114+
this._onValidatorChange();
115115
}
116116

117117
/**
@@ -166,14 +166,14 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
166166
* ```
167167
*/
168168
@Input()
169-
public set value(value: Date | string) {
169+
public set value(value: Date | string | undefined | null) {
170170
this._value = value;
171171
this.setDateValue(value);
172172
this.onChangeCallback(value);
173173
this.updateMask();
174174
}
175175

176-
public get value(): Date | string {
176+
public get value(): Date | string | undefined | null {
177177
return this._value;
178178
}
179179

@@ -218,7 +218,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
218218
private document: Document;
219219
private _isFocused: boolean;
220220
private _defaultInputFormat: string;
221-
private _value: Date | string;
221+
private _value?: Date | string;
222222
private _minValue: Date | string;
223223
private _maxValue: Date | string;
224224
private _inputDateParts: DatePartInfo[];
@@ -230,9 +230,9 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
230230
minutes: 1,
231231
seconds: 1
232232
};
233-
private onTouchCallback: (...args: any[]) => void = noop;
233+
234234
private onChangeCallback: (...args: any[]) => void = noop;
235-
private onValidatorChange: (...args: any[]) => void = noop;
235+
private _onValidatorChange: (...args: any[]) => void = noop;
236236

237237
private get datePartDeltas(): DatePartDeltas {
238238
return Object.assign({}, this._datePartDeltas, this.spinDelta);
@@ -392,7 +392,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
392392

393393
/** @hidden @internal */
394394
public registerOnValidatorChange?(fn: () => void): void {
395-
this.onValidatorChange = fn;
395+
this._onValidatorChange = fn;
396396
}
397397

398398
/** @hidden @internal */
@@ -402,7 +402,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
402402

403403
/** @hidden @internal */
404404
public override registerOnTouched(fn: any): void {
405-
this.onTouchCallback = fn;
405+
this._onTouchedCallback = fn;
406406
}
407407

408408
/** @hidden @internal */
@@ -472,7 +472,7 @@ export class IgxDateTimeEditorDirective extends IgxMaskDirective implements OnCh
472472
return;
473473
}
474474
this._isFocused = true;
475-
this.onTouchCallback();
475+
this._onTouchedCallback();
476476
this.updateMask();
477477
super.onFocus();
478478
this.nativeElement.select();

projects/igniteui-angular/src/lib/directives/mask/mask.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export class IgxMaskDirective implements OnInit, AfterViewChecked, ControlValueA
143143

144144
private readonly defaultMask = 'CCCCCCCCCC';
145145

146-
private _onTouchedCallback: () => void = noop;
146+
protected _onTouchedCallback: () => void = noop;
147147
private _onChangeCallback: (_: any) => void = noop;
148148

149149
constructor(

projects/igniteui-angular/src/lib/directives/toggle/toggle.directive.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
4848
* ```html
4949
* <div
5050
* igxToggle
51-
* (onOpened)='onToggleOpened($event)'>
51+
* (opened)='onToggleOpened($event)'>
5252
* </div>
5353
* ```
5454
*/
@@ -67,7 +67,7 @@ export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
6767
* ```html
6868
* <div
6969
* igxToggle
70-
* (onOpening)='onToggleOpening($event)'>
70+
* (opening)='onToggleOpening($event)'>
7171
* </div>
7272
* ```
7373
*/
@@ -86,7 +86,7 @@ export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
8686
* ```html
8787
* <div
8888
* igxToggle
89-
* (onClosed)='onToggleClosed($event)'>
89+
* (closed)='onToggleClosed($event)'>
9090
* </div>
9191
* ```
9292
*/
@@ -124,7 +124,7 @@ export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
124124
* ```html
125125
* <div
126126
* igxToggle
127-
* (onAppended)='onToggleAppended()'>
127+
* (appended)='onToggleAppended()'>
128128
* </div>
129129
* ```
130130
*/
@@ -376,7 +376,7 @@ export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
376376

377377
// in case event is not canceled this will close the toggle and we need to unsubscribe.
378378
// Otherwise if for some reason, e.g. close on outside click, close() gets called before
379-
// onClosed was fired we will end with calling onClosing more than once
379+
// closed was fired we will end with calling closing more than once
380380
if (!e.cancel) {
381381
this.clearSubscription(this._overlayClosingSub);
382382
}

0 commit comments

Comments
 (0)