Skip to content

Commit 3ab6bc0

Browse files
refactor: rectify approach to accurate name
1 parent d7f2e41 commit 3ab6bc0

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

packages/block-library/src/image/index.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,11 @@ function block_core_image_render_lightbox( $block_content, $block ) {
215215
$p->set_attribute( 'data-wp-init', 'callbacks.setButtonStyles' );
216216
$p->set_attribute( 'data-wp-on-async--load', 'callbacks.setButtonStyles' );
217217
$p->set_attribute( 'data-wp-on-async-window--resize', 'callbacks.setButtonStyles' );
218-
// Set an event to prefetch the image on pointerenter and pointerdown(mobile).
219-
// Pointerleave is used to cancel the prefetch if the user hovers away from the image
218+
// Set an event to preload the image on pointerenter and pointerdown(mobile).
219+
// Pointerleave is used to cancel the preload if the user hovers away from the image
220220
// before the predefined delay.
221-
$p->set_attribute( 'data-wp-on--pointerenter', 'actions.prefetchImageWithDelay' );
222-
$p->set_attribute( 'data-wp-on--pointerdown', 'actions.prefetchImage' );
221+
$p->set_attribute( 'data-wp-on--pointerenter', 'actions.preloadImageWithDelay' );
222+
$p->set_attribute( 'data-wp-on--pointerdown', 'actions.preloadImage' );
223223
$p->set_attribute( 'data-wp-on--pointerleave', 'actions.cancelPrefetch' );
224224
// Sets an event callback on the `img` because the `figure` element can also
225225
// contain a caption, and we don't want to trigger the lightbox when the

packages/block-library/src/image/view.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ const { state, actions, callbacks } = store(
5151
{
5252
state: {
5353
currentImageId: null,
54-
prefetchTimers: {},
55-
prefetchedImageIds: new Set(),
54+
preloadTimers: {},
55+
preloadedImageIds: new Set(),
5656
get currentImage() {
5757
return state.metadata[ state.currentImageId ];
5858
},
@@ -217,15 +217,15 @@ const { state, actions, callbacks } = store(
217217
}
218218
}
219219
},
220-
prefetchImage() {
220+
preloadImage() {
221221
const { imageId } = getContext();
222222
const imageMetadata = state.metadata[ imageId ];
223223
const uploadedSrc = imageMetadata.uploadedSrc;
224224

225-
// Bails if the image is not valid or if it has already been prefetched.
225+
// Bails if the image is not valid or if it has already been preloaded.
226226
if (
227227
! isValidLink( uploadedSrc ) ||
228-
state.prefetchedImageIds.has( imageId )
228+
state.preloadedImageIds.has( imageId )
229229
) {
230230
return;
231231
}
@@ -238,37 +238,37 @@ const { state, actions, callbacks } = store(
238238
imageLink.as = 'image';
239239
imageLink.href = uploadedSrc;
240240

241-
// Apply srcset if available for better responsive prefetching
241+
// Apply srcset if available for better responsive preloading
242242
if ( srcset ) {
243243
imageLink.setAttribute( 'imagesrcset', srcset );
244244
imageLink.setAttribute( 'imagesizes', '100vw' );
245245
}
246246

247247
document.head.appendChild( imageLink );
248-
state.prefetchedImageIds.add( imageId );
248+
state.preloadedImageIds.add( imageId );
249249
},
250-
prefetchImageWithDelay() {
250+
preloadImageWithDelay() {
251251
const { imageId } = getContext();
252252

253-
// Cancels any previous prefetch timer for the same image.
254-
if ( state.prefetchTimers && state.prefetchTimers[ imageId ] ) {
255-
clearTimeout( state.prefetchTimers[ imageId ] );
253+
// Cancels any previous preload timer for the same image.
254+
if ( state.preloadTimers && state.preloadTimers[ imageId ] ) {
255+
clearTimeout( state.preloadTimers[ imageId ] );
256256
}
257257

258-
// Set a new timer to prefetch the image after a short delay.
259-
state.prefetchTimers[ imageId ] = setTimeout(
258+
// Set a new timer to preload the image after a short delay.
259+
state.preloadTimers[ imageId ] = setTimeout(
260260
withScope( () => {
261-
actions.prefetchImage();
262-
delete state.prefetchTimers[ imageId ];
261+
actions.preloadImage();
262+
delete state.preloadTimers[ imageId ];
263263
} ),
264264
200
265265
);
266266
},
267267
cancelPrefetch() {
268268
const { imageId } = getContext();
269-
if ( state.prefetchTimers && state.prefetchTimers[ imageId ] ) {
270-
clearTimeout( state.prefetchTimers[ imageId ] );
271-
delete state.prefetchTimers[ imageId ];
269+
if ( state.preloadTimers && state.preloadTimers[ imageId ] ) {
270+
clearTimeout( state.preloadTimers[ imageId ] );
271+
delete state.preloadTimers[ imageId ];
272272
}
273273
},
274274
},

0 commit comments

Comments
 (0)