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

Merge branch '2.0' of https://github.com/kkarich/ionic into feature-clear-input

Browse Source
This commit is contained in:
unknown
2016-04-14 09:03:06 -05:00
parent d8e2849be8 d1b84461ef
commit dfdf4d88e6
9 changed files with 104 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/img/img.ts
View File

@ -84,7 +84,7 @@ export class Img {
}
private _loaded(isLoaded: boolean) {
this._elementRef.nativeElement.classList[isLoaded ? 'add': 'remove']('img-loaded');
this._elementRef.nativeElement.classList[isLoaded ? 'add' : 'remove']('img-loaded');
}
enable(shouldEnable: boolean) {

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

@ -55,8 +55,8 @@ import {Platform} from '../../platform/platform';
* <ion-input type="tel"></ion-input>
* </ion-item>
*
* <ion-item clearInput>
* <ion-input placeholder="Username"></ion-input>
* <ion-item>
* <ion-input placeholder="Username" clearInput></ion-input>
* </ion-item>
* ```
*

2
ionic/components/input/test/clear-input/main.html
View File

@ -11,7 +11,7 @@
<ion-item>
<ion-label>Text 1:</ion-label>
<ion-input class="e2eClearInput" [(ngModel)]="myParam" clearInput></ion-input>
<ion-input class="e2eClearInput" [(ngModel)]="myValue" clearInput></ion-input>
</ion-item>

4
ionic/platform/platform.ts
View File

@ -190,7 +190,7 @@ export class Platform {
triggerReady() {
this._zone.run(() => {
this._readyResolve();
})
});
}
/**
@ -741,5 +741,5 @@ export interface PlatformVersion {
str?: string;
num?: number;
major?: number;
minor?: number
minor?: number;
}