misc changes

This commit is contained in:
Manuel Mtz-Almeida
2017-03-28 21:21:37 +02:00
parent 3d569eb88a
commit b5c7ab2e98
3 changed files with 11 additions and 5 deletions

View File

@@ -8,6 +8,8 @@ import { mockApp, mockConfig, mockElementRef, mockRenderer } from '../../../util
describe('DateTime', () => {
// TODO
// pass commonInputTest()
describe('validate', () => {

View File

@@ -1,4 +1,4 @@
import { ElementRef, EventEmitter, Input, Output, Renderer } from '@angular/core';
import { NgZone, ElementRef, EventEmitter, Input, Output, Renderer } from '@angular/core';
import { ControlValueAccessor } from '@angular/forms';
import { NgControl } from '@angular/forms';
@@ -174,10 +174,12 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
/**
* @hidden
*/
_setFocus() {
_inputFireFocus() {
if (this._isFocus) {
return;
}
assert(NgZone.isInAngularZone(), 'callback should be zoned');
this._isFocus = true;
this.ionFocus.emit(this);
this._inputUpdated();
@@ -186,10 +188,12 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
/**
* @hidden
*/
_setBlur() {
_inputFireBlur() {
if (!this._isFocus) {
return;
}
assert(NgZone.isInAngularZone(), 'callback should be zoned');
this._isFocus = false;
this.ionBlur.emit(this);
this._inputUpdated();

View File

@@ -5,9 +5,9 @@ import { assert } from './util';
const lorem_ipsum = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi maximus nisl lobortis interdum condimentum. Cras volutpat, massa quis vehicula eleifend, turpis mauris sodales erat, ut varius ligula ipsum et turpis. Aliquam erat volutpat. Maecenas sodales pellentesque auctor. Suspendisse faucibus a erat sit amet pretium. Vestibulum nec tempus tellus. Mauris fringilla faucibus dui sed vestibulum. Curabitur porttitor consectetur nisl. Nulla porta, neque sed congue tempus, erat nunc rutrum diam, eu elementum sapien leo quis eros. Donec non convallis felis. Nam eu pharetra sapien.';
export const TEXT_CORPUS: any = [
['hola', 'hola'],
['', ''],
[' ', ' '],
['hola', 'hola'],
['adiós', 'adiós'],
['hola y adiós', 'hola y adiós'],
[lorem_ipsum, lorem_ipsum]
@@ -142,7 +142,7 @@ function testWriteValue<T>(input: BaseInput<T>, config: TestConfig, isInit: bool
}
assertEqual(OnChangeCalled, 1, 'loop: OnChangeCalled was not called');
assertEqual(OnTouchedCalled, 1, 'loop: OnTouchedCalled was not called');
OnTouchedCalled = OnChangeCalled = ionChangeCalled = 0;
console.log(test[0], input.value);