Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,19 @@ private function lazy_load_videos( ?string $poster, OD_Tag_Visitor_Context $cont
if ( 'auto' !== $initial_preload ) {
$processor->set_attribute( 'preload', 'auto' );
}
$processor->remove_attribute( 'loading' );
return;
}

// If the element is visible in any viewport, do not lazy-load it.
if ( $max_intersection_ratio > 0 ) {
$processor->remove_attribute( 'loading' );
return;
}

// Add native lazy loading for browsers that support it.
$processor->set_attribute( 'loading', 'lazy' );

if ( 'none' !== $initial_preload ) {
$processor->set_attribute( 'data-original-preload', null !== $initial_preload ? $initial_preload : 'default' );
$processor->set_attribute( 'preload', 'none' );
Expand Down
72 changes: 42 additions & 30 deletions plugins/image-prioritizer/lazy-load-video.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,50 @@
const lazyVideoObserver = new IntersectionObserver(
( entries ) => {
for ( const entry of entries ) {
if ( entry.isIntersecting ) {
const video = /** @type {HTMLVideoElement} */ entry.target;
const restoreVideo = ( /** @type {HTMLVideoElement} */ video ) => {
const poster = video.getAttribute( 'data-original-poster' );
if ( poster ) {
video.setAttribute( 'poster', poster );
}

const poster = video.getAttribute( 'data-original-poster' );
if ( poster ) {
video.setAttribute( 'poster', poster );
}
if ( video.hasAttribute( 'data-original-autoplay' ) ) {
video.setAttribute( 'autoplay', 'autoplay' );
}

if ( video.hasAttribute( 'data-original-autoplay' ) ) {
video.setAttribute( 'autoplay', 'autoplay' );
}
const preload = video.getAttribute( 'data-original-preload' );
if ( preload ) {
if ( 'default' === preload ) {
video.removeAttribute( 'preload' );
} else {
video.setAttribute( 'preload', preload );
}
}
};

const preload = video.getAttribute( 'data-original-preload' );
if ( preload ) {
if ( 'default' === preload ) {
video.removeAttribute( 'preload' );
} else {
video.setAttribute( 'preload', preload );
}
}
const videos = document.querySelectorAll( 'video.od-lazy-video' );

lazyVideoObserver.unobserve( video );
// When the browser natively supports lazy-loading on video, restore the original
// attributes immediately and rely on loading="lazy" to defer the video load.
if ( 'loading' in HTMLMediaElement.prototype ) {
for ( const video of videos ) {
restoreVideo( /** @type {HTMLVideoElement} */ ( video ) );
}
} else {
const lazyVideoObserver = new IntersectionObserver(
( entries ) => {
for ( const entry of entries ) {
if ( entry.isIntersecting ) {
restoreVideo(
/** @type {HTMLVideoElement} */ ( entry.target )
);
lazyVideoObserver.unobserve( entry.target );
}
}
},
{
rootMargin: '100% 0% 100% 0%',
threshold: 0,
}
},
{
rootMargin: '100% 0% 100% 0%',
threshold: 0,
}
);
);

const videos = document.querySelectorAll( 'video.od-lazy-video' );
for ( const video of videos ) {
lazyVideoObserver.observe( video );
for ( const video of videos ) {
lazyVideoObserver.observe( video );
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>...</title>
<meta name="generator" content="optimization-detective 0.0.0">
<meta name="generator" content="image-prioritizer 0.0.0">
</head>
<body>
<div id="page">
<video class="desktop" width="1200" height="500" src="https://example.com/header.mp4" preload="auto" autoplay></video>
</div>
</body>
</html>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php
return static function ( Test_Image_Prioritizer_Helper $test_case ): void {
$breakpoint_max_widths = array( 480, 600, 782 );

add_filter(
'od_breakpoint_max_widths',
static function () use ( $breakpoint_max_widths ) {
return $breakpoint_max_widths;
}
);

foreach ( array_merge( $breakpoint_max_widths, array( 1000 ) ) as $viewport_width ) {
$test_case->store_url_metric(
od_get_url_metrics_slug( od_get_normalized_query_vars() ),
$test_case->get_sample_url_metric(
array(
'viewport_width' => $viewport_width,
'elements' => array(
array(
'isLCP' => false,
'xpath' => '/HTML/BODY/DIV[@id=\'page\']/*[1][self::VIDEO]',
'boundingClientRect' => $test_case->get_sample_dom_rect(),
'intersectionRatio' => 0.0,
),
),
)
)
);
}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>...</title>
<meta name="generator" content="optimization-detective 0.0.0">
<meta name="generator" content="image-prioritizer 0.0.0">
</head>
<body>
<div id="page">
<video class="desktop" poster="https://example.com/poster.jpg" width="1200" height="500" src="https://example.com/header.mp4" loading="lazy"></video>
</div>
</body>
</html>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php
return static function ( Test_Image_Prioritizer_Helper $test_case ): void {
$breakpoint_max_widths = array( 480, 600, 782 );

add_filter(
'od_breakpoint_max_widths',
static function () use ( $breakpoint_max_widths ) {
return $breakpoint_max_widths;
}
);

foreach ( array_merge( $breakpoint_max_widths, array( 1000 ) ) as $viewport_width ) {
$test_case->store_url_metric(
od_get_url_metrics_slug( od_get_normalized_query_vars() ),
$test_case->get_sample_url_metric(
array(
'viewport_width' => $viewport_width,
'elements' => array(
array(
'isLCP' => false,
'xpath' => '/HTML/BODY/DIV[@id=\'page\']/*[1][self::VIDEO]',
'boundingClientRect' => $test_case->get_sample_dom_rect(),
'intersectionRatio' => 0.5,
),
),
)
)
);
}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>...</title>
<meta name="generator" content="optimization-detective 0.0.0">
<meta name="generator" content="image-prioritizer 0.0.0">
</head>
<body>
<div id="page">
<video class="desktop" poster="https://example.com/poster.jpg" width="1200" height="500" src="https://example.com/header.mp4" loading="lazy"></video>
</div>
</body>
</html>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php
return static function ( Test_Image_Prioritizer_Helper $test_case ): void {
$breakpoint_max_widths = array( 480, 600, 782 );

add_filter(
'od_breakpoint_max_widths',
static function () use ( $breakpoint_max_widths ) {
return $breakpoint_max_widths;
}
);

foreach ( array_merge( $breakpoint_max_widths, array( 1000 ) ) as $viewport_width ) {
$test_case->store_url_metric(
od_get_url_metrics_slug( od_get_normalized_query_vars() ),
$test_case->get_sample_url_metric(
array(
'viewport_width' => $viewport_width,
'elements' => array(
array(
'isLCP' => true,
'xpath' => '/HTML/BODY/DIV[@id=\'page\']/*[1][self::VIDEO]',
'boundingClientRect' => $test_case->get_sample_dom_rect(),
'intersectionRatio' => 1.0,
),
),
)
)
);
}
};
Loading