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

fix(input): checked attr can be an empty string or no value

Browse Source
This commit is contained in:
Adam Bradley
2016-01-26 11:11:48 -06:00
parent 42f6b1056f
commit e76b55994c
13 changed files with 291 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ionic/components/toggle/toggle.ts
View File

@ -1,8 +1,9 @@
import {Component, ElementRef, Renderer, Input, Optional} from 'angular2/core';
import {NgControl} from 'angular2/common';
import {Config} from '../../config/config';
import {Form} from '../../util/form';
import {Config} from '../../config/config';
import {isTrueProperty} from '../../util/util';
import {Item} from '../item/item';
import {pointerCoord} from '../../util/dom';
@ -125,7 +126,7 @@ export class Toggle {
set checked(val) {
if (!this._disabled) {
this._checked = (val === true || val === 'true');
this._checked = isTrueProperty(val);
this.onChange(this._checked);
this._item && this._item.setCssClass('item-toggle-checked', this._checked);
}
@ -137,7 +138,7 @@ export class Toggle {
}
set disabled(val) {
this._disabled = (val === true || val === 'true');
this._disabled = isTrueProperty(val);
this._item && this._item.setCssClass('item-toggle-disabled', this._disabled);
}
@ -145,7 +146,7 @@ export class Toggle {
* @private
*/
private pointerDown(ev) {
if (/touch/.test(ev.type)) {
if (ev.type.indexOf('touch') > -1) {
this._touched = Date.now();
}