Skip to content

Commit c38bc42

Browse files
committed
test(img): fix img tests
1 parent 97ec20e commit c38bc42

File tree

12 files changed

+121
-133
lines changed

12 files changed

+121
-133
lines changed

src/components/img/img.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ export class Img implements OnDestroy {
223223
if (this._hasLoaded) {
224224
console.debug(`render ${this._src} ${Date.now()}`);
225225
this._isLoaded(true);
226+
this._srcAttr(this._src);
226227
}
227228
});
228229
}
@@ -243,10 +244,13 @@ export class Img implements OnDestroy {
243244
* @internal
244245
*/
245246
_srcAttr(srcAttr: string) {
247+
const imgEle = this._img;
246248
const renderer = this._renderer;
247249

248-
renderer.setElementAttribute(this._img, 'src', srcAttr);
249-
renderer.setElementAttribute(this._img, 'alt', this.alt);
250+
if (imgEle.src !== srcAttr) {
251+
renderer.setElementAttribute(this._img, 'src', srcAttr);
252+
renderer.setElementAttribute(this._img, 'alt', this.alt);
253+
}
250254
}
251255

252256
/**

src/components/img/test/basic/app-module.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ export class E2EApp {
5252
MyImg
5353
],
5454
imports: [
55-
IonicModule.forRoot(E2EApp, {
56-
imgWorkerUrl: '/dist/e2e/workers/ion-img-worker.js'
57-
})
55+
IonicModule.forRoot(E2EApp)
5856
],
5957
bootstrap: [IonicApp],
6058
entryComponents: [

src/components/img/test/basic/main.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
<ion-item>
2727

2828
<ion-avatar item-left>
29-
<ion-img src="../img/img/blues-brothers.jpg"></ion-img>
29+
<ion-img src="../img/blues-brothers.jpg"></ion-img>
3030
</ion-avatar>
3131

3232
Loaded Avatar
3333

3434
<ion-avatar item-right>
35-
<ion-img src="../img/img/bueller.jpg"></ion-img>
35+
<ion-img src="../img/bueller.jpg"></ion-img>
3636
</ion-avatar>
3737

3838
</ion-item>
@@ -68,13 +68,13 @@
6868
<ion-item>
6969

7070
<ion-thumbnail item-left>
71-
<ion-img src="../img/img/delorean.jpg"></ion-img>
71+
<ion-img src="../img/delorean.jpg"></ion-img>
7272
</ion-thumbnail>
7373

7474
Loaded Thumbnail
7575

7676
<ion-thumbnail item-right>
77-
<ion-img src="../img/img/batmobile.jpg"></ion-img>
77+
<ion-img src="../img/batmobile.jpg"></ion-img>
7878
</ion-thumbnail>
7979

8080
</ion-item>
@@ -83,7 +83,7 @@
8383

8484
<div padding>
8585
Default ion-img w/in content, display: inline-block.
86-
<ion-img alt="Smokey" width="150" height="112" src="../img/img/bandit.jpg"></ion-img>
86+
<ion-img alt="Smokey" width="150" height="112" src="../img/bandit.jpg"></ion-img>
8787
has width, height and alt set.
8888
</div>
8989

src/components/img/test/cards/app-module.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ export class E2EApp {
2929
E2EPage
3030
],
3131
imports: [
32-
IonicModule.forRoot(E2EApp, {
33-
imgWorkerUrl: '/dist/e2e/workers/ion-img-worker.js'
34-
})
32+
IonicModule.forRoot(E2EApp)
3533
],
3634
bootstrap: [IonicApp],
3735
entryComponents: [

src/components/img/test/cards/main.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@
1515
</ion-card-header>
1616

1717
<ion-item *ngIf="item % 2 == 0">
18-
<ion-img width="68px" height="50px" item-left src="../img/img/ghostbusters.jpg"></ion-img>
18+
<ion-img width="68px" height="50px" item-left src="../img/ghostbusters.jpg"></ion-img>
1919
<h2>Item thumbnail right</h2>
2020
<h3>ion-img left</h3>
2121
<ion-thumbnail item-right>
22-
<ion-img src="../img/img/img/bandit.jpg"></ion-img>
22+
<ion-img src="../img/bandit.jpg"></ion-img>
2323
</ion-thumbnail>
2424
</ion-item>
2525

2626
<ion-item *ngIf="item % 2 == 1">
2727
<ion-avatar item-left>
28-
<ion-img src="../img/img/blues-brothers.jpg"></ion-img>
28+
<ion-img src="../img/blues-brothers.jpg"></ion-img>
2929
</ion-avatar>
3030
<h2>Item avatar left</h2>
3131
<h3>ion-img right</h3>
3232
<p>Isn't it beautiful.</p>
33-
<ion-img width="68px" height="50px" item-right src="../img/img/ghostbusters.jpg"></ion-img>
33+
<ion-img width="68px" height="50px" item-right src="../img/ghostbusters.jpg"></ion-img>
3434
</ion-item>
3535

3636
</ion-card>

src/components/img/test/lazy-load/app-module.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ export class E2EApp {
2424
E2EPage
2525
],
2626
imports: [
27-
IonicModule.forRoot(E2EApp, {
28-
imgWorkerUrl: '/dist/e2e/workers/ion-img-worker.js'
29-
})
27+
IonicModule.forRoot(E2EApp)
3028
],
3129
bootstrap: [IonicApp],
3230
entryComponents: [

0 commit comments

Comments
 (0)