From 343765b7ab1ce5392389063b0513ce54a0a76506 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 22 Apr 2014 15:41:08 +0200 Subject: [PATCH] images with data-src attribute are now lazy-loaded #793 --- index.html | 10 +++++----- js/reveal.js | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index 49dbd51..7eabd5c 100644 --- a/index.html +++ b/index.html @@ -71,7 +71,7 @@ try pressing down.

- Down arrow + Down arrow
@@ -82,14 +82,14 @@

Basement Level 2

Cornify

- Unicorn + Unicorn

Basement Level 3

That's it, time to go back up.

- Up arrow + Up arrow
@@ -245,7 +245,7 @@ Reveal.addEventListener( 'customevent', function() { Set data-background="#007777" on a slide to change the full page background to the given color. All CSS color formats are supported.

- Down arrow + Down arrow
@@ -346,7 +346,7 @@ function linkify( selector ) {

Spectacular image!

- Meny + Meny
diff --git a/js/reveal.js b/js/reveal.js index 160b90f..524678d 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -1905,6 +1905,11 @@ var Reveal = (function(){ viewDistance = isOverview() ? 6 : 1; } + // Limit view distance on weaker devices + if( isPrintingPDF() ) { + viewDistance = Number.MAX_VALUE; + } + for( var x = 0; x < horizontalSlidesLength; x++ ) { var horizontalSlide = horizontalSlides[x]; @@ -1915,7 +1920,13 @@ var Reveal = (function(){ distanceX = Math.abs( ( indexh - x ) % ( horizontalSlidesLength - viewDistance ) ) || 0; // Show the horizontal slide if it's within the view distance - horizontalSlide.style.display = distanceX > viewDistance ? 'none' : 'block'; + if( distanceX < viewDistance ) { + horizontalSlide.style.display = 'block'; + loadSlide( horizontalSlide ); + } + else { + horizontalSlide.style.display = 'none'; + } if( verticalSlidesLength ) { @@ -1926,7 +1937,13 @@ var Reveal = (function(){ distanceY = x === indexh ? Math.abs( indexv - y ) : Math.abs( y - oy ); - verticalSlide.style.display = ( distanceX + distanceY ) > viewDistance ? 'none' : 'block'; + if( distanceX + distanceY < viewDistance ) { + verticalSlide.style.display = 'block'; + loadSlide( verticalSlide ); + } + else { + verticalSlide.style.display = 'none'; + } } } @@ -2149,6 +2166,19 @@ var Reveal = (function(){ } + /** + * Loads any content that is set to load lazily (data-src) + * inside of the given slide. + */ + function loadSlide( slide ) { + + toArray( slide.querySelectorAll( 'img[data-src]' ) ).forEach( function( element ) { + element.setAttribute( 'src', element.getAttribute( 'data-src' ) ); + element.removeAttribute( 'data-src' ); + } ); + + } + /** * Determine what available routes there are for navigation. *