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

fix(img): ensure scroll has been initialized

Browse Source
This commit is contained in:
Adam Bradley
2016-12-07 15:59:20 -06:00
parent aec8f51b60
commit 39e1dce72d
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -777,7 +777,7 @@ export class Content extends Ion implements OnDestroy, OnInit {
* @private * @private
*/ */
imgsUpdate() { imgsUpdate() {
if (this._imgs.length && this.isImgsUpdatable()) { if (this._scroll.initialized && this._imgs.length && this.isImgsUpdatable()) {
updateImgs(this._imgs, this.scrollTop, this.scrollHeight, this.directionY, IMG_REQUESTABLE_BUFFER, IMG_RENDERABLE_BUFFER); updateImgs(this._imgs, this.scrollTop, this.scrollHeight, this.directionY, IMG_REQUESTABLE_BUFFER, IMG_RENDERABLE_BUFFER);
} }
} }

2
src/components/tabs/test/basic/app-module.ts
View File

@ -187,7 +187,7 @@ export class Tab2 {
<button ion-button (click)="appNavPop()">App Nav Pop</button> <button ion-button (click)="appNavPop()">App Nav Pop</button>
</p> </p>
<ion-list [virtualScroll]="items" [headerFn]="headerFn"> <ion-list [virtualScroll]="items">
<ion-item *virtualItem="let item"> <ion-item *virtualItem="let item">
Item: {{item}} Item: {{item}}

6
src/components/virtual-scroll/test/cards/main.html
View File

@ -8,15 +8,15 @@
<div [virtualScroll]="items" approxItemHeight="320px"> <div [virtualScroll]="items" approxItemHeight="320px">
<ion-card *virtualItem="let item"> <ion-card *virtualItem="let item; let itemBounds = bounds;">
<div> <div>
<ion-img [src]="item.imgSrc" [height]="item.imgHeight" [alt]="item.name"></ion-img> <ion-img [src]="item.imgSrc" [height]="item.imgHeight" [alt]="item.name" [bounds]="itemBounds"></ion-img>
</div> </div>
<ion-item> <ion-item>
<ion-avatar item-left> <ion-avatar item-left>
<ion-img [src]="item.avatarSrc" height="40" width="40"></ion-img> <ion-img [src]="item.avatarSrc" height="40" width="40" [bounds]="itemBounds"></ion-img>
</ion-avatar> </ion-avatar>
<h2>{{ item.name }}</h2> <h2>{{ item.name }}</h2>
</ion-item> </ion-item>

5
src/util/scroll-view.ts
View File

@ -11,6 +11,7 @@ export class ScrollView {
scrollStart = new Subject<ScrollEvent>(); scrollStart = new Subject<ScrollEvent>();
scroll = new Subject<ScrollEvent>(); scroll = new Subject<ScrollEvent>();
scrollEnd = new Subject<ScrollEvent>(); scrollEnd = new Subject<ScrollEvent>();
initialized: boolean;
private _el: HTMLElement; private _el: HTMLElement;
private _js: boolean; private _js: boolean;
@ -28,7 +29,9 @@ export class ScrollView {
constructor(private _dom: DomController) {} constructor(private _dom: DomController) {}
init(ele: HTMLElement, contentTop: number, contentBottom: number) { init(ele: HTMLElement, contentTop: number, contentBottom: number) {
if (!this._el) { if (!this.initialized) {
this.initialized = true;
assert(ele, 'scroll-view, element can not be null'); assert(ele, 'scroll-view, element can not be null');
this._el = ele; this._el = ele;