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

Merge branch '2.0' into windows-mode

Browse Source 
# Conflicts:
#	ionic/components/searchbar/searchbar.ts
This commit is contained in:
Brandy Carney
2016-02-29 19:02:55 -05:00
parent a5945317d5 9b8d5bc55a
commit 02da18b311
69 changed files with 2677 additions and 1197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/input/input-base.ts
View File

@@ -438,7 +438,7 @@ export class InputBase {
if (this._useAssist && this._scrollView) {
setTimeout(() => {
this.deregScrollMove();
this._deregScroll = this._scrollView.addScrollEventListener(this._scrollMove);
this._deregScroll = this._scrollView.addScrollListener(this._scrollMove);
}, 80);
}
}

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

@@ -41,7 +41,7 @@ import {Platform} from '../../platform/platform';
* </ion-item>
*
* <ion-item>
* <ion-labe fixed>Website</ion-label>
* <ion-label fixed>Website</ion-label>
* <ion-input type="url"></ion-input>
* </ion-item>
*