From 887d65f278b63794cc092eed3294dbc792f018f6 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Fri, 17 Jul 2015 10:12:39 -0500 Subject: [PATCH] rename form.ts to input.ts --- ionic/components/form/{form.ts => input.ts} | 0 ionic/components/form/label.ts | 19 ++++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) rename ionic/components/form/{form.ts => input.ts} (100%) diff --git a/ionic/components/form/form.ts b/ionic/components/form/input.ts similarity index 100% rename from ionic/components/form/form.ts rename to ionic/components/form/input.ts diff --git a/ionic/components/form/label.ts b/ionic/components/form/label.ts index 94d0e4278d..6d99990306 100644 --- a/ionic/components/form/label.ts +++ b/ionic/components/form/label.ts @@ -1,8 +1,10 @@ import {Directive, Parent, Optional} from 'angular2/angular2'; -import {Input} from './text-input'; import {IonicConfig} from '../../config/config'; import * as dom from '../../util/dom'; +import {Input} from './text-input'; +import {Checkbox} from '../checkbox/checkbox'; +import {RadioButton} from '../radio/radio'; @Directive({ @@ -17,12 +19,19 @@ import * as dom from '../../util/dom'; } }) export class Label { - constructor(@Optional() @Parent() container: Input, config: IonicConfig) { - if (container) { - container.registerLabel(this); + constructor( + @Optional() @Parent() textContainer: Input, + @Optional() @Parent() checkboxContainer: Checkbox, + @Optional() @Parent() radioContainer: RadioButton, + config: IonicConfig + ) { + this.container = textContainer || checkboxContainer || radioContainer; + + if (this.container) { + this.container.registerLabel(this); this.inputLabel = true; } - this.container = container; + this.scrollAssist = config.setting('keyboardScrollAssist'); }