From 6360d41f6a0ca627d6110e54c8efab91a3b733d1 Mon Sep 17 00:00:00 2001 From: Manuel Mtz-Almeida Date: Tue, 28 Mar 2017 21:37:11 +0200 Subject: [PATCH] Misc changes 2 --- src/components/datetime/datetime.ts | 4 ++-- src/components/range/range.ts | 4 ++-- src/components/searchbar/searchbar.ts | 10 ++++------ src/components/select/select.ts | 4 ++-- src/components/toggle/toggle.ts | 4 ++-- src/util/base-input.ts | 10 +++++----- src/util/input-tester.ts | 8 ++++---- 7 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/components/datetime/datetime.ts b/src/components/datetime/datetime.ts index 4351f3da84..8057a1b7ad 100644 --- a/src/components/datetime/datetime.ts +++ b/src/components/datetime/datetime.ts @@ -515,10 +515,10 @@ export class DateTime extends BaseInput implements AfterContentIni this.validate(); // Present picker - this._setFocus(); + this._fireFocus(); picker.present(pickerOptions); picker.onDidDismiss(() => { - this._setBlur(); + this._fireBlur(); }); } diff --git a/src/components/range/range.ts b/src/components/range/range.ts index 1d048e693f..065f59ad5e 100644 --- a/src/components/range/range.ts +++ b/src/components/range/range.ts @@ -299,7 +299,7 @@ export class Range extends BaseInput implements AfterViewInit, ControlValue } // trigger ionFocus event - this._setFocus(); + this._fireFocus(); // prevent default so scrolling does not happen ev.preventDefault(); @@ -361,7 +361,7 @@ export class Range extends BaseInput implements AfterViewInit, ControlValue this._haptic.gestureSelectionEnd(); // trigger ionBlur event - this._setBlur(); + this._fireBlur(); } /** @internal */ diff --git a/src/components/searchbar/searchbar.ts b/src/components/searchbar/searchbar.ts index f1e9fc3724..04a7c4a13e 100644 --- a/src/components/searchbar/searchbar.ts +++ b/src/components/searchbar/searchbar.ts @@ -5,8 +5,6 @@ import { Config } from '../../config/config'; import { BaseInput } from '../../util/base-input'; import { isPresent, isTrueProperty } from '../../util/util'; import { Platform } from '../../platform/platform'; -import { TimeoutDebouncer } from '../../util/debouncer'; - /** * @name Searchbar @@ -300,7 +298,7 @@ export class Searchbar extends BaseInput { * Sets the Searchbar to focused and active on input focus. */ inputFocused(ev: UIEvent) { - this._setFocus(); + this._fireFocus(); this._isActive = true; } @@ -317,7 +315,7 @@ export class Searchbar extends BaseInput { this._shouldBlur = true; return; } - this._setBlur(); + this._fireBlur(); } /** @@ -352,8 +350,8 @@ export class Searchbar extends BaseInput { this._isActive = false; } - _setFocus() { + _fireFocus() { this._renderer.invokeElementMethod(this._searchbarInput.nativeElement, 'focus'); - super._setFocus(); + super._fireFocus(); } } diff --git a/src/components/select/select.ts b/src/components/select/select.ts index 046ff51205..30e4b241bf 100644 --- a/src/components/select/select.ts +++ b/src/components/select/select.ts @@ -326,9 +326,9 @@ export class Select extends BaseInput implements AfterViewInit, OnDest } overlay.present(selectOptions); - this._setFocus(); + this._fireFocus(); overlay.onDidDismiss(() => { - this._setBlur(); + this._fireBlur(); }); } diff --git a/src/components/toggle/toggle.ts b/src/components/toggle/toggle.ts index d2410d44f2..d82fabc6b0 100644 --- a/src/components/toggle/toggle.ts +++ b/src/components/toggle/toggle.ts @@ -144,7 +144,7 @@ export class Toggle extends BaseInput implements IonicTapInput, AfterVi console.debug('toggle, _onDragStart', startX); this._startX = startX; - this._setFocus(); + this._fireFocus(); this._activated = true; } @@ -197,7 +197,7 @@ export class Toggle extends BaseInput implements IonicTapInput, AfterVi } this._activated = false; - this._setBlur(); + this._fireBlur(); this._startX = null; } diff --git a/src/util/base-input.ts b/src/util/base-input.ts index 55e8d5e59f..130a207859 100644 --- a/src/util/base-input.ts +++ b/src/util/base-input.ts @@ -1,4 +1,4 @@ -import { NgZone, ElementRef, EventEmitter, Input, Output, Renderer } from '@angular/core'; +import { ElementRef, EventEmitter, Input, Output, Renderer } from '@angular/core'; import { ControlValueAccessor } from '@angular/forms'; import { NgControl } from '@angular/forms'; @@ -174,11 +174,11 @@ export class BaseInput extends Ion implements CommonInput { /** * @hidden */ - _inputFireFocus() { + _fireFocus() { if (this._isFocus) { return; } - assert(NgZone.isInAngularZone(), 'callback should be zoned'); + // assert(NgZone.isInAngularZone(), 'callback should be zoned'); this._isFocus = true; this.ionFocus.emit(this); @@ -188,11 +188,11 @@ export class BaseInput extends Ion implements CommonInput { /** * @hidden */ - _inputFireBlur() { + _fireBlur() { if (!this._isFocus) { return; } - assert(NgZone.isInAngularZone(), 'callback should be zoned'); + // assert(NgZone.isInAngularZone(), 'callback should be zoned'); this._isFocus = false; this.ionBlur.emit(this); diff --git a/src/util/input-tester.ts b/src/util/input-tester.ts index 0ae6927937..1d0faac379 100644 --- a/src/util/input-tester.ts +++ b/src/util/input-tester.ts @@ -81,15 +81,15 @@ function testState(input: BaseInput, config: TestConfig, isInit: boolean) assertEqual(ev, input, 'ionFocus argument is wrong'); focusCount++; }); - input._setFocus(); + input._fireFocus(); assertEqual(input._isFocus, true, 'should be focus'); assertEqual(input.isFocus(), true, 'should be focus'); - input._setFocus(); + input._fireFocus(); - input._setBlur(); + input._fireBlur(); assertEqual(input._isFocus, false, 'should be not focus'); assertEqual(input.isFocus(), false, 'should be not focus'); - input._setBlur(); // it should not crash + input._fireBlur(); // it should not crash assertEqual(focusCount, 1, 'ionFocus was not called correctly'); assertEqual(blurCount, 1, 'ionBlur was not called correctly');