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

misc changes 3

Browse Source
This commit is contained in:
Manuel Mtz-Almeida
2017-03-28 21:51:01 +02:00
parent 6360d41f6a
commit 47e1cdce9d
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/datetime/datetime.ts
View File

@ -485,7 +485,7 @@ export class DateTime extends BaseInput<DateTimeData> implements AfterContentIni
* @hidden * @hidden
*/ */
open() { open() {
if (this._isFocus || this._disabled) { if (this.isFocus() || this._disabled) {
return; return;
} }
console.debug('datetime, open picker'); console.debug('datetime, open picker');

7
src/components/select/select.ts
View File

@ -7,7 +7,7 @@ import { App } from '../app/app';
import { Config } from '../../config/config'; import { Config } from '../../config/config';
import { Form } from '../../util/form'; import { Form } from '../../util/form';
import { BaseInput } from '../../util/base-input'; import { BaseInput } from '../../util/base-input';
import { isCheckedProperty, isTrueProperty, isBlank, deepCopy, deepEqual } from '../../util/util'; import { isCheckedProperty, isTrueProperty, deepCopy, deepEqual } from '../../util/util';
import { Item } from '../item/item'; import { Item } from '../item/item';
import { NavController } from '../../navigation/nav-controller'; import { NavController } from '../../navigation/nav-controller';
import { Option } from '../option/option'; import { Option } from '../option/option';
@ -223,7 +223,7 @@ export class Select extends BaseInput<string[]> implements AfterViewInit, OnDest
* Open the select interface. * Open the select interface.
*/ */
open() { open() {
if (this._isFocus || this._disabled) { if (this.isFocus() || this._disabled) {
return; return;
} }
@ -372,9 +372,6 @@ export class Select extends BaseInput<string[]> implements AfterViewInit, OnDest
} }
_inputNormalize(val: any): string[] { _inputNormalize(val: any): string[] {
if (isBlank(val)) {
return [];
}
if (Array.isArray(val)) { if (Array.isArray(val)) {
return val; return val;
} }