much improved distance measuring logic, improves performance on mobile and fixes some crashes

This commit is contained in:
Hakim El Hattab committed 2013-08-10 12:52:40 -04:00
1 parent fc43e905d5
commit 7b5e537157
2 files changed
+74 -14

No files matched your search

+72 -12
View File
@@ -14,6 +14,8 @@ var Reveal = (function(){
VERTICAL_SLIDES_SELECTOR = '.reveal .slides>section.present>section',
HOME_SLIDE_SELECTOR = '.reveal .slides>section:first-child',
IS_MOBILE = navigator.userAgent.match( /(iphone|ipod|android)/gi ),
// Configurations defaults, can be overridden at initialization time
config = {
@@ -1029,7 +1031,6 @@ var Reveal = (function(){
htransform = 'translateZ(-2500px) translate(' + ( ( i - indexh ) * hoffset ) + '%, 0%)';
hslide.setAttribute( 'data-index-h', i );
hslide.style.display = 'block';
hslide.style.WebkitTransform = htransform;
hslide.style.MozTransform = htransform;
hslide.style.msTransform = htransform;
@@ -1048,7 +1049,6 @@ var Reveal = (function(){
vslide.setAttribute( 'data-index-h', i );
vslide.setAttribute( 'data-index-v', j );
vslide.style.display = 'block';
vslide.style.WebkitTransform = vtransform;
vslide.style.MozTransform = vtransform;
vslide.style.msTransform = vtransform;
@@ -1068,6 +1068,8 @@ var Reveal = (function(){
}
}
updateSlidesVisibility();
layout();
if( !wasActive ) {
@@ -1309,6 +1311,9 @@ var Reveal = (function(){
indexh = updateSlides( HORIZONTAL_SLIDES_SELECTOR, h === undefined ? indexh : h );
indexv = updateSlides( VERTICAL_SLIDES_SELECTOR, v === undefined ? indexv : v );
// Update the visibility of slides now that the indices have changed
updateSlidesVisibility();
layout();
// Apply the new state
@@ -1480,16 +1485,6 @@ var Reveal = (function(){
for( var i = 0; i < slidesLength; i++ ) {
var element = slides[i];
// Optimization; hide all slides that are three or more steps
// away from the present slide
if( isOverview() === false ) {
// The distance loops so that it measures 1 between the first
// and last slides
var distance = Math.abs( ( index - i ) % ( slidesLength - 3 ) ) || 0;
element.style.display = distance > 3 ? 'none' : 'block';
}
var reverse = config.rtl && !isVerticalSlide( element );
element.classList.remove( 'past' );
@@ -1555,6 +1550,71 @@ var Reveal = (function(){
}
/**
* Optimization method; hide all slides that are far away
* from the present slide.
*/
function updateSlidesVisibility() {
// Select all slides and convert the NodeList result to
// an array
var horizontalSlides = toArray( document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ) ),
horizontalSlidesLength = horizontalSlides.length,
distance;
if( horizontalSlidesLength ) {
// The number of steps away from the present slide that will
// be visible
var threshold = 3;
// Heavily limited on weaker devices
if( IS_MOBILE ) {
threshold = 1;
}
if( isOverview() ) {
threshold = 6;
}
for( var x = 0; x < horizontalSlidesLength; x++ ) {
var horizontalSlide = horizontalSlides[x];
var verticalSlides = toArray( horizontalSlide.querySelectorAll( 'section' ) ),
verticalSlidesLength = verticalSlides.length;
if( verticalSlidesLength ) {
// Always show the vertical stack itself, even if its child
// slides are invisible
horizontalSlide.style.display = 'block';
for( var y = 0; y < verticalSlidesLength; y++ ) {
var verticalSlide = verticalSlides[y];
var dx = x - indexh,
dy = y - indexv;
distance = Math.sqrt( dx*dx + dy*dy );
verticalSlide.style.display = distance > threshold ? 'none' : 'block';
}
}
else {
// Loops so that it measures 1 between the first and last slides
distance = Math.abs( ( indexh - x ) % ( horizontalSlidesLength - threshold ) ) || 0;
horizontalSlide.style.display = distance > threshold ? 'none' : 'block';
}
}
}
}
/**
* Updates the progress bar to reflect the current slide.
*/
+2 -2
View File
@@ -1,8 +1,8 @@
/*!
* reveal.js 2.5.0 (2013-08-08, 10:21)
* reveal.js 2.5.0 (2013-08-10, 12:49)
* http://lab.hakim.se/reveal-js
* MIT licensed
*
* Copyright (C) 2013 Hakim El Hattab, http://hakim.se
*/
var Reveal=function(){"use strict";function e(e){return zt||Yt?(window.addEventListener("load",k,!1),l(Ct,e),r(),o(),void 0):(document.body.setAttribute("class","no-transforms"),void 0)}function t(){if(Ot.theme=document.querySelector("#theme"),Ot.wrapper=document.querySelector(".reveal"),Ot.slides=document.querySelector(".reveal .slides"),document.querySelector(".reveal .backgrounds")||(Ot.background=document.createElement("div"),Ot.background.classList.add("backgrounds"),Ot.wrapper.appendChild(Ot.background)),!Ot.wrapper.querySelector(".progress")){var e=document.createElement("div");e.classList.add("progress"),e.innerHTML="<span></span>",Ot.wrapper.appendChild(e)}if(!Ot.wrapper.querySelector(".controls")){var t=document.createElement("aside");t.classList.add("controls"),t.innerHTML='<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>',Ot.wrapper.appendChild(t)}if(!Ot.wrapper.querySelector(".state-background")){var n=document.createElement("div");n.classList.add("state-background"),Ot.wrapper.appendChild(n)}if(!Ot.wrapper.querySelector(".pause-overlay")){var r=document.createElement("div");r.classList.add("pause-overlay"),Ot.wrapper.appendChild(r)}Ot.progress=document.querySelector(".reveal .progress"),Ot.progressbar=document.querySelector(".reveal .progress span"),Ct.controls&&(Ot.controls=document.querySelector(".reveal .controls"),Ot.controlsLeft=d(document.querySelectorAll(".navigate-left")),Ot.controlsRight=d(document.querySelectorAll(".navigate-right")),Ot.controlsUp=d(document.querySelectorAll(".navigate-up")),Ot.controlsDown=d(document.querySelectorAll(".navigate-down")),Ot.controlsPrev=d(document.querySelectorAll(".navigate-prev")),Ot.controlsNext=d(document.querySelectorAll(".navigate-next")))}function n(){function e(e,t){var n={background:e.getAttribute("data-background"),backgroundSize:e.getAttribute("data-background-size"),backgroundImage:e.getAttribute("data-background-image"),backgroundColor:e.getAttribute("data-background-color"),backgroundRepeat:e.getAttribute("data-background-repeat"),backgroundPosition:e.getAttribute("data-background-position"),backgroundTransition:e.getAttribute("data-background-transition")},r=document.createElement("div");return r.className="slide-background",n.background&&(/^(http|file|\/\/)/gi.test(n.background)||/\.(png|jpg|jpeg|gif|bmp)$/gi.test(n.background)?r.style.backgroundImage="url("+n.background+")":r.style.background=n.background),n.backgroundSize&&(r.style.backgroundSize=n.backgroundSize),n.backgroundImage&&(r.style.backgroundImage='url("'+n.backgroundImage+'")'),n.backgroundColor&&(r.style.backgroundColor=n.backgroundColor),n.backgroundRepeat&&(r.style.backgroundRepeat=n.backgroundRepeat),n.backgroundPosition&&(r.style.backgroundPosition=n.backgroundPosition),n.backgroundTransition&&r.setAttribute("data-background-transition",n.backgroundTransition),t.appendChild(r),r}v()&&document.body.classList.add("print-pdf"),Ot.background.innerHTML="",Ot.background.classList.add("no-transition"),d(document.querySelectorAll(Mt)).forEach(function(t){var n;n=v()?e(t,t):e(t,Ot.background),d(t.querySelectorAll("section")).forEach(function(t){v()?e(t,t):e(t,n)})})}function r(){/iphone|ipod|android/gi.test(navigator.userAgent)&&!/crios/gi.test(navigator.userAgent)&&(window.addEventListener("load",p,!1),window.addEventListener("orientationchange",p,!1))}function o(){function e(){n.length&&head.js.apply(null,n),a()}for(var t=[],n=[],r=0,o=Ct.dependencies.length;o>r;r++){var i=Ct.dependencies[r];(!i.condition||i.condition())&&(i.async?n.push(i.src):t.push(i.src),"function"==typeof i.callback&&head.ready(i.src.match(/([\w\d_\-]*)\.?js$|[^\\\/]*$/i)[0],i.callback))}t.length?(head.ready(e),head.js.apply(null,t)):e()}function a(){t(),i(),K(),setTimeout(function(){m("ready",{indexh:St,indexv:At,currentSlide:xt})},1)}function i(e){if(Ot.wrapper.classList.remove(Ct.transition),"object"==typeof e&&l(Ct,e),Yt===!1&&(Ct.transition="linear"),Ot.wrapper.classList.add(Ct.transition),Ot.wrapper.setAttribute("data-transition-speed",Ct.transitionSpeed),Ot.wrapper.setAttribute("data-background-transition",Ct.backgroundTransition),Ot.controls&&(Ot.controls.style.display=Ct.controls&&Ot.controls?"block":"none"),Ot.progress&&(Ot.progress.style.display=Ct.progress&&Ot.progress?"block":"none"),Ct.rtl?Ot.wrapper.classList.add("rtl"):Ot.wrapper.classList.remove("rtl"),Ct.center?Ot.wrapper.classList.add("center"):Ot.wrapper.classList.remove("center"),Ct.mouseWheel?(document.addEventListener("DOMMouseScroll",ft,!1),document.addEventListener("mousewheel",ft,!1)):(document.removeEventListener("DOMMouseScroll",ft,!1),document.removeEventListener("mousewheel",ft,!1)),Ct.rollingLinks?g():h(),Ct.previewLinks?y():(b(),y("[data-preview-link]")),Ct.theme&&Ot.theme){var t=Ot.theme.getAttribute("href"),n=/[^\/]*?(?=\.css)/,r=t.match(n)[0];Ct.theme!==r&&(t=t.replace(n,Ct.theme),Ot.theme.setAttribute("href",t))}Y()}function s(){Ft=!0,Line truncated
var Reveal=function(){"use strict";function e(e){return Xt||Ht?(window.addEventListener("load",k,!1),l(Rt,e),r(),o(),void 0):(document.body.setAttribute("class","no-transforms"),void 0)}function t(){if(zt.theme=document.querySelector("#theme"),zt.wrapper=document.querySelector(".reveal"),zt.slides=document.querySelector(".reveal .slides"),document.querySelector(".reveal .backgrounds")||(zt.background=document.createElement("div"),zt.background.classList.add("backgrounds"),zt.wrapper.appendChild(zt.background)),!zt.wrapper.querySelector(".progress")){var e=document.createElement("div");e.classList.add("progress"),e.innerHTML="<span></span>",zt.wrapper.appendChild(e)}if(!zt.wrapper.querySelector(".controls")){var t=document.createElement("aside");t.classList.add("controls"),t.innerHTML='<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>',zt.wrapper.appendChild(t)}if(!zt.wrapper.querySelector(".state-background")){var n=document.createElement("div");n.classList.add("state-background"),zt.wrapper.appendChild(n)}if(!zt.wrapper.querySelector(".pause-overlay")){var r=document.createElement("div");r.classList.add("pause-overlay"),zt.wrapper.appendChild(r)}zt.progress=document.querySelector(".reveal .progress"),zt.progressbar=document.querySelector(".reveal .progress span"),Rt.controls&&(zt.controls=document.querySelector(".reveal .controls"),zt.controlsLeft=d(document.querySelectorAll(".navigate-left")),zt.controlsRight=d(document.querySelectorAll(".navigate-right")),zt.controlsUp=d(document.querySelectorAll(".navigate-up")),zt.controlsDown=d(document.querySelectorAll(".navigate-down")),zt.controlsPrev=d(document.querySelectorAll(".navigate-prev")),zt.controlsNext=d(document.querySelectorAll(".navigate-next")))}function n(){function e(e,t){var n={background:e.getAttribute("data-background"),backgroundSize:e.getAttribute("data-background-size"),backgroundImage:e.getAttribute("data-background-image"),backgroundColor:e.getAttribute("data-background-color"),backgroundRepeat:e.getAttribute("data-background-repeat"),backgroundPosition:e.getAttribute("data-background-position"),backgroundTransition:e.getAttribute("data-background-transition")},r=document.createElement("div");return r.className="slide-background",n.background&&(/^(http|file|\/\/)/gi.test(n.background)||/\.(png|jpg|jpeg|gif|bmp)$/gi.test(n.background)?r.style.backgroundImage="url("+n.background+")":r.style.background=n.background),n.backgroundSize&&(r.style.backgroundSize=n.backgroundSize),n.backgroundImage&&(r.style.backgroundImage='url("'+n.backgroundImage+'")'),n.backgroundColor&&(r.style.backgroundColor=n.backgroundColor),n.backgroundRepeat&&(r.style.backgroundRepeat=n.backgroundRepeat),n.backgroundPosition&&(r.style.backgroundPosition=n.backgroundPosition),n.backgroundTransition&&r.setAttribute("data-background-transition",n.backgroundTransition),t.appendChild(r),r}v()&&document.body.classList.add("print-pdf"),zt.background.innerHTML="",zt.background.classList.add("no-transition"),d(document.querySelectorAll(Pt)).forEach(function(t){var n;n=v()?e(t,t):e(t,zt.background),d(t.querySelectorAll("section")).forEach(function(t){v()?e(t,t):e(t,n)})})}function r(){/iphone|ipod|android/gi.test(navigator.userAgent)&&!/crios/gi.test(navigator.userAgent)&&(window.addEventListener("load",p,!1),window.addEventListener("orientationchange",p,!1))}function o(){function e(){n.length&&head.js.apply(null,n),a()}for(var t=[],n=[],r=0,o=Rt.dependencies.length;o>r;r++){var i=Rt.dependencies[r];(!i.condition||i.condition())&&(i.async?n.push(i.src):t.push(i.src),"function"==typeof i.callback&&head.ready(i.src.match(/([\w\d_\-]*)\.?js$|[^\\\/]*$/i)[0],i.callback))}t.length?(head.ready(e),head.js.apply(null,t)):e()}function a(){t(),i(),$(),setTimeout(function(){m("ready",{indexh:At,indexv:qt,currentSlide:Tt})},1)}function i(e){if(zt.wrapper.classList.remove(Rt.transition),"object"==typeof e&&l(Rt,e),Ht===!1&&(Rt.transition="linear"),zt.wrapper.classList.add(Rt.transition),zt.wrapper.setAttribute("data-transition-speed",Rt.transitionSpeed),zt.wrapper.setAttribute("data-background-transition",Rt.backgroundTransition),zt.controls&&(zt.controls.style.display=Rt.controls&&zt.controls?"block":"none"),zt.progress&&(zt.progress.style.display=Rt.progress&&zt.progress?"block":"none"),Rt.rtl?zt.wrapper.classList.add("rtl"):zt.wrapper.classList.remove("rtl"),Rt.center?zt.wrapper.classList.add("center"):zt.wrapper.classList.remove("center"),Rt.mouseWheel?(document.addEventListener("DOMMouseScroll",vt,!1),document.addEventListener("mousewheel",vt,!1)):(document.removeEventListener("DOMMouseScroll",vt,!1),document.removeEventListener("mousewheel",vt,!1)),Rt.rollingLinks?g():h(),Rt.previewLinks?y():(b(),y("[data-preview-link]")),Rt.theme&&zt.theme){var t=zt.theme.getAttribute("href"),n=/[^\/]*?(?=\.css)/,r=t.match(n)[0];Rt.theme!==r&&(t=t.replace(n,Rt.theme),zt.theme.setAttribute("href",t))}Y()}function s(){Kt=!0,Line truncated