mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-20 12:29:55 +08:00
chore(): fix typescript errors
This commit is contained in:
@ -17,6 +17,8 @@ export class TextInput {
|
||||
@Input() ngModel: any;
|
||||
@Output() valueChange: EventEmitter<string> = new EventEmitter();
|
||||
@Output() focusChange: EventEmitter<boolean> = new EventEmitter();
|
||||
public type: string;
|
||||
private _relocated: boolean;
|
||||
|
||||
constructor(
|
||||
@Attribute('type') type: string,
|
||||
|
@ -50,7 +50,7 @@ import {pointerCoord} from '../../util/dom';
|
||||
'role': 'checkbox',
|
||||
'class': 'item',
|
||||
'tappable': '',
|
||||
'tabindex': 0,
|
||||
'tabindex': '0',
|
||||
'[attr.aria-disabled]': 'disabled',
|
||||
'(touchstart)': 'pointerDown($event)',
|
||||
'(mousedown)': 'pointerDown($event)',
|
||||
@ -70,9 +70,16 @@ import {pointerCoord} from '../../util/dom';
|
||||
})
|
||||
export class Toggle {
|
||||
@Input() value: string = '';
|
||||
@Input() public checked: any = false;
|
||||
@Input() disabled: boolean = false;
|
||||
@Input() id: string;
|
||||
private _checked: boolean;
|
||||
private _touched: number = 0;
|
||||
private _mode: string;
|
||||
private _startX: any;
|
||||
private addMoveListener: any;
|
||||
private removeMoveListener: any;
|
||||
public labelId: string;
|
||||
public isActivated: boolean;
|
||||
|
||||
constructor(
|
||||
private _form: Form,
|
||||
@ -88,8 +95,7 @@ export class Toggle {
|
||||
|
||||
_form.register(this);
|
||||
|
||||
this.lastTouch = 0;
|
||||
this.mode = config.get('mode');
|
||||
this._mode = config.get('mode');
|
||||
|
||||
if (ngControl) {
|
||||
ngControl.valueAccessor = this;
|
||||
@ -100,13 +106,13 @@ export class Toggle {
|
||||
let currentX = pointerCoord(ev).x;
|
||||
|
||||
if (self.checked) {
|
||||
if (currentX + 15 < self.startX) {
|
||||
if (currentX + 15 < self._startX) {
|
||||
self.toggle();
|
||||
self.startX = currentX;
|
||||
self._startX = currentX;
|
||||
}
|
||||
} else if (currentX - 15 > self.startX) {
|
||||
} else if (currentX - 15 > self._startX) {
|
||||
self.toggle();
|
||||
self.startX = currentX;
|
||||
self._startX = currentX;
|
||||
}
|
||||
}
|
||||
|
||||
@ -151,13 +157,14 @@ export class Toggle {
|
||||
this.checked = !this.checked;
|
||||
}
|
||||
|
||||
get checked() {
|
||||
get checked(): boolean {
|
||||
return !!this._checked;
|
||||
}
|
||||
|
||||
set checked(val) {
|
||||
@Input()
|
||||
set checked(val: boolean) {
|
||||
this._checked = !!val;
|
||||
this._renderer.setElementAttribute(this._elementRef, 'aria-checked', this._checked);
|
||||
this._renderer.setElementAttribute(this._elementRef, 'aria-checked', this._checked.toString());
|
||||
this.onChange(this._checked);
|
||||
}
|
||||
|
||||
@ -166,12 +173,12 @@ export class Toggle {
|
||||
*/
|
||||
pointerDown(ev) {
|
||||
if (/touch/.test(ev.type)) {
|
||||
this.lastTouch = Date.now();
|
||||
this._touched = Date.now();
|
||||
}
|
||||
|
||||
if (this.isDisabled(ev)) return;
|
||||
|
||||
this.startX = pointerCoord(ev).x;
|
||||
this._startX = pointerCoord(ev).x;
|
||||
|
||||
this.removeMoveListener();
|
||||
this.addMoveListener();
|
||||
@ -188,11 +195,11 @@ export class Toggle {
|
||||
let endX = pointerCoord(ev).x;
|
||||
|
||||
if (this.checked) {
|
||||
if (this.startX + 4 > endX) {
|
||||
this.toggle(ev);
|
||||
if (this._startX + 4 > endX) {
|
||||
this.toggle();
|
||||
}
|
||||
} else if (this.startX - 4 < endX) {
|
||||
this.toggle(ev);
|
||||
} else if (this._startX - 4 < endX) {
|
||||
this.toggle();
|
||||
}
|
||||
|
||||
this.removeMoveListener();
|
||||
@ -235,7 +242,7 @@ export class Toggle {
|
||||
*/
|
||||
ngOnDestroy() {
|
||||
this.removeMoveListener();
|
||||
this.toggleEle = this.addMoveListener = this.removeMoveListener = null;
|
||||
this.addMoveListener = this.removeMoveListener = null;
|
||||
this._form.deregister(this);
|
||||
}
|
||||
|
||||
@ -243,7 +250,7 @@ export class Toggle {
|
||||
* @private
|
||||
*/
|
||||
isDisabled(ev) {
|
||||
return (this.lastTouch + 999 > Date.now() && /mouse/.test(ev.type)) || (this.mode == 'ios' && ev.target.tagName == 'ION-TOGGLE');
|
||||
return (this._touched + 999 > Date.now() && /mouse/.test(ev.type)) || (this._mode == 'ios' && ev.target.tagName == 'ION-TOGGLE');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1,7 +1,6 @@
|
||||
import {Component, Directive, Host, ElementRef, Optional, forwardRef, Inject, ContentChildren, ContentChild, QueryList} from 'angular2/core';
|
||||
|
||||
import {Ion} from '../ion';
|
||||
import {Config} from '../../config/config';
|
||||
import {MenuToggle} from '../menu/menu-toggle';
|
||||
import {Navbar} from '../navbar/navbar';
|
||||
import {Button} from '../button/button';
|
||||
@ -15,11 +14,8 @@ export class ToolbarBase extends Ion {
|
||||
titleRef = null;
|
||||
titleCmp: any;
|
||||
|
||||
constructor(
|
||||
elementRef: ElementRef,
|
||||
config: Config
|
||||
) {
|
||||
super(elementRef, config);
|
||||
constructor(elementRef: ElementRef) {
|
||||
super(elementRef);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -95,11 +91,8 @@ export class ToolbarBase extends Ion {
|
||||
})
|
||||
export class Toolbar extends ToolbarBase {
|
||||
|
||||
constructor(
|
||||
elementRef: ElementRef,
|
||||
config: Config
|
||||
) {
|
||||
super(elementRef, config);
|
||||
constructor(elementRef: ElementRef) {
|
||||
super(elementRef);
|
||||
}
|
||||
|
||||
}
|
||||
@ -137,7 +130,7 @@ export class ToolbarTitle extends Ion {
|
||||
@Optional() toolbar: Toolbar,
|
||||
@Optional() @Inject(forwardRef(() => Navbar)) navbar: Navbar
|
||||
) {
|
||||
super(elementRef, null);
|
||||
super(elementRef);
|
||||
toolbar && toolbar.setTitleCmp(this);
|
||||
navbar && navbar.setTitleCmp(this);
|
||||
}
|
||||
|
Reference in New Issue
Block a user