javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 20:33:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): fix Input types

Browse Source
This commit is contained in:
Tim Lancina
2016-01-13 23:52:10 -06:00
parent 7f19ba5396
commit c475a6490b
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ionic/components/input/input.ts
View File

@ -74,11 +74,20 @@ import {Icon} from '../icon/icon';
directives: [NgIf, forwardRef(() => InputScrollAssist), TextInput, Button]
})
export class ItemInput {
/**
* @private
*/
@Input() clearInput: any;
private _assist: boolean;
private input: TextInput;
private label: Label;
private scrollMove: EventListener;
private startCoord: {x: number, y: number};
private deregScroll: () => void;
keyboardHeight: number;
value: string = '';
type: string = null;
lastTouch: number = 0;
displayType: string;
@Input() clearInput: any;
constructor(
config: Config,
@ -96,10 +105,7 @@ export class ItemInput {
) {
_form.register(this);
this.type = null;
this.lastTouch = 0;
// make more gud with pending @Attributes API
//TODO make more gud with pending @Attributes API
this.displayType = (isFloating === '' ? 'floating' : (isStacked === '' ? 'stacked' : (isFixed === '' ? 'fixed' : (isInset === '' ? 'inset' : null))));
this._assist = config.get('scrollAssist');
@ -110,7 +116,7 @@ export class ItemInput {
* @private
*/
@ContentChild(TextInput)
set _setInput(textInput) {
set _setInput(textInput: TextInput) {
if (textInput) {
textInput.addClass('item-input');
if (this.displayType) {
@ -135,7 +141,7 @@ export class ItemInput {
* @private
*/
@ContentChild(Label)
set _setLabel(label) {
set _setLabel(label: Label) {
if (label && this.displayType) {
label.addClass(this.displayType + '-label');
}
@ -187,7 +193,7 @@ export class ItemInput {
self.input.labelledBy(self.label.id);
}
self.scrollMove = function(ev) {
self.scrollMove = function(ev: UIEvent) {
if (!(self._nav && self._nav.isTransitioning())) {
self.deregMove();