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

fix merge conflicts

Browse Source
This commit is contained in:
Adam Bradley
2015-09-08 23:06:59 -05:00
parent f0cb0a8de0 92960c891d
commit 72b419030a
31 changed files with 788 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,12 +13,12 @@ import {IonicComponent, IonicView} from '../../config/annotations';
/**
* @name ionCheckbox
* @classdesc
* @description
* The checkbox is no different than the HTML checkbox input, except it's styled differently
*
* See the [Angular 2 Docs](https://angular.io/docs/js/latest/api/forms/) for more info on forms and input.
*
* @example
* @usage
* ```html
* <ion-checkbox checked="true" value="isChecked" ng-control="htmlCtrl">
* HTML5