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

Activator: activated

Browse Source
This commit is contained in:
Adam Bradley
2015-09-08 23:05:26 -05:00
parent 1b1d91661c
commit f0cb0a8de0
10 changed files with 342 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ionic/components/checkbox/checkbox.ts
View File

@ -10,7 +10,6 @@ import {Ion} from '../ion';
import {IonInput} from '../form/input';
import {IonicConfig} from '../../config/config';
import {IonicComponent, IonicView} from '../../config/annotations';
import {TapClick} from '../button/button';
/**
* @name ionCheckbox
@ -37,6 +36,7 @@ import {TapClick} from '../button/button';
host: {
'class': 'item',
'role': 'checkbox',
'tappable': 'true',
'[attr.tab-index]': 'tabIndex',
'[attr.aria-checked]': 'checked',
'[attr.aria-disabled]': 'disabled',
@ -59,16 +59,13 @@ export class Checkbox extends Ion {
* @param {ElementRef} elementRef TODO
* @param {IonicConfig} ionicConfig TODO
* @param {NgControl=} ngControl TODO
* @param {TapClick=} tapClick TODO
*/
constructor(
elementRef: ElementRef,
config: IonicConfig,
@Optional() ngControl: NgControl,
tapClick: TapClick
@Optional() ngControl: NgControl
) {
super(elementRef, config);
this.tapClick = tapClick;
this.tabIndex = 0;
this.id = IonInput.nextId();
@ -102,11 +99,9 @@ export class Checkbox extends Ion {
* @param {MouseEvent} ev The click event.
*/
click(ev) {
if (this.tapClick.allowClick(ev)) {
ev.preventDefault();
ev.stopPropagation();
this.toggle();
}
ev.preventDefault();
ev.stopPropagation();
this.toggle();
}
/**