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): update input css/tests

Browse Source
This commit is contained in:
Adam Bradley
2016-01-25 22:46:18 -06:00
parent b3a7298a52
commit 42f6b1056f
39 changed files with 214 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ionic/components/select/select.ts
View File

@ -4,7 +4,7 @@ import {NgControl} from 'angular2/common';
import {Alert} from '../alert/alert';
import {Form} from '../../util/form';
import {Item} from '../item/item';
import {merge} from '../../util/util';
import {merge, isDefined} from '../../util/util';
import {NavController} from '../nav/nav-controller';
import {Option} from '../option/option';
@ -143,6 +143,7 @@ export class Select {
if (_item) {
this.id = 'sel-' + _item.registerInput('select');
this._labelId = 'lbl-' + _item.id;
this._item.setCssClass('item-select', true);
}
if (!_nav) {
@ -154,24 +155,22 @@ export class Select {
* @private
*/
ngAfterContentInit() {
var selectedOption = this.options.toArray().find(o => o.checked);
let values = [];
let selectedTexts = [];
if (!selectedOption) {
this.options.toArray().forEach(o => {
o.checked = o.value === this.value + '';
if (o.checked) {
selectedOption = o;
}
});
this.options.toArray().forEach(option => {
if (option.checked) {
values.push( isDefined(option.value) ? option.value : option.text );
selectedTexts.push(option.text);
}
});
} else {
this.value = selectedOption.value;
this._selectedText = selectedOption.text;
this.value = values.join(',');
this._selectedText = selectedTexts.join(', ');
setTimeout(()=> {
this.onChange(this.value);
});
}
setTimeout(()=> {
this.onChange(this.value);
});
}
/**