Skip to content

Commit 2a1bb76

Browse files
refactor(function and variable names): updated image and full res image loaded event handlers and tr
BREAKING CHANGE: imagePlaceholderLoaded output changed to placeholderLoaded
1 parent d78fc4e commit 2a1bb76

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/app/app.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h3>Top image</h3>
88
></sn-image-loader>
99

1010
<h1>Scroll down for bottom image ↓</h1>
11-
<h3>Bottom image placeholder loaded: <span class="placeholder-boolean">{{ imagePlaceholderLoaded }}</span></h3>
11+
<h3>Bottom placeholder loaded: <span class="placeholder-boolean">{{ placeholderLoaded }}</span></h3>
1212
<div class="spacer"></div>
1313

1414
<h3>Bottom image</h3>
@@ -17,8 +17,8 @@ <h3>Bottom image</h3>
1717
[sizes]="sizes"
1818
imgClass="img img--bottom"
1919
alt="lorem ipsum"
20-
(imagePlaceholderLoaded)="onPlaceholderLoad($event)"
21-
(imageLoaded)="onFullResLoad($event)"
20+
(placeholderLoaded)="onPlaceholderLoad($event)"
21+
(imageLoaded)="onImageLoad($event)"
2222
class="sn-image-loader sn-image-loader--bottom"
2323
></sn-image-loader>
2424
<h3>Bottom image imageLoaded event count: <span class="full-res-count">{{ imageLoadedEventCount }}</span></h3>

src/app/app.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class AppComponent {
4242
* @type {boolean}
4343
* @memberof AppComponent
4444
*/
45-
imagePlaceholderLoaded = false;
45+
placeholderLoaded = false;
4646

4747
/**
4848
* Incremented on each image load event.
@@ -59,7 +59,7 @@ export class AppComponent {
5959
* @memberof AppComponent
6060
*/
6161
public onPlaceholderLoad(imageLoadedEvent: ImageLoadedEvent) {
62-
this.imagePlaceholderLoaded = true;
62+
this.placeholderLoaded = true;
6363
}
6464

6565
/**
@@ -68,7 +68,7 @@ export class AppComponent {
6868
*
6969
* @memberof AppComponent
7070
*/
71-
public onFullResLoad(imageLoadedEvent: ImageLoadedEvent) {
71+
public onImageLoad(imageLoadedEvent: ImageLoadedEvent) {
7272
this.imageLoadedEventCount++;
7373
}
7474
}

src/app/image-loader/image-loader.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ describe('ImageLoaderComponent', () => {
7777
});
7878

7979
it('should fire placeholder loaded event on image load when loaded is false', () => {
80-
const spy = spyOn(component.imagePlaceholderLoaded, 'emit');
80+
const spy = spyOn(component.placeholderLoaded, 'emit');
8181
component.loaded = false;
8282
const imageElement = fixture.debugElement.query(By.css('img'));
8383
imageElement.triggerEventHandler('load', null);

src/app/image-loader/image-loader.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import { WindowRef } from '@thisissoon/angular-inviewport';
3030
* [image]="image"
3131
* [sizes]="sizes"
3232
* imgClass="foo"
33-
* (imagePlaceholderLoaded)="onPlaceholderLoad($event)"
34-
* (imageLoaded)="onFullResLoad($event)"
33+
* (placeholderLoaded)="onPlaceholderLoad($event)"
34+
* (imageLoaded)="onImageLoad($event)"
3535
* alt="lorem ipsum">
3636
* </sn-image-loader>
3737
* ```
@@ -156,7 +156,7 @@ export class ImageLoaderComponent implements OnInit, AfterViewInit, OnDestroy {
156156
* @memberof ImageLoaderComponent
157157
*/
158158
@Output()
159-
public imagePlaceholderLoaded: EventEmitter<ImageLoadedEvent> = new EventEmitter<ImageLoadedEvent>();
159+
public placeholderLoaded: EventEmitter<ImageLoadedEvent> = new EventEmitter<ImageLoadedEvent>();
160160
/**
161161
* Output for full res image loaded event.
162162
*
@@ -308,7 +308,7 @@ export class ImageLoaderComponent implements OnInit, AfterViewInit, OnDestroy {
308308
srcset: this.srcset
309309
};
310310
if (!this.loaded) {
311-
this.imagePlaceholderLoaded.emit(eventData);
311+
this.placeholderLoaded.emit(eventData);
312312
return;
313313
}
314314
this.imageLoaded.emit(eventData);

0 commit comments

Comments
 (0)