disable transition into and out of overview mode #829

This commit is contained in:
Hakim El Hattab committed 2014-03-25 17:46:10 +01:00
1 parent baa6fa45de
commit a9c2d4d663
4 files changed
+46 -61

No files matched your search

+35 -54
View File
@@ -151,12 +151,6 @@ var Reveal = (function(){
// Delays updates to the URL due to a Chrome thumbnailer bug
writeURLTimeout = 0,
// A delay used to activate the overview mode
activateOverviewTimeout = 0,
// A delay used to deactivate the overview mode
deactivateOverviewTimeout = 0,
// Flags if the interaction event listeners are bound
eventsAreBound = false,
@@ -1238,67 +1232,57 @@ var Reveal = (function(){
dom.wrapper.classList.add( 'overview' );
dom.wrapper.classList.remove( 'overview-deactivating' );
clearTimeout( activateOverviewTimeout );
clearTimeout( deactivateOverviewTimeout );
var horizontalSlides = document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR );
// Not the pretties solution, but need to let the overview
// class apply first so that slides are measured accurately
// before we can position them
activateOverviewTimeout = setTimeout( function() {
for( var i = 0, len1 = horizontalSlides.length; i < len1; i++ ) {
var hslide = horizontalSlides[i],
hoffset = config.rtl ? -105 : 105;
var horizontalSlides = document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR );
hslide.setAttribute( 'data-index-h', i );
for( var i = 0, len1 = horizontalSlides.length; i < len1; i++ ) {
var hslide = horizontalSlides[i],
hoffset = config.rtl ? -105 : 105;
// Apply CSS transform
transformElement( hslide, 'translateZ(-'+ depth +'px) translate(' + ( ( i - indexh ) * hoffset ) + '%, 0%)' );
hslide.setAttribute( 'data-index-h', i );
if( hslide.classList.contains( 'stack' ) ) {
// Apply CSS transform
transformElement( hslide, 'translateZ(-'+ depth +'px) translate(' + ( ( i - indexh ) * hoffset ) + '%, 0%)' );
var verticalSlides = hslide.querySelectorAll( 'section' );
if( hslide.classList.contains( 'stack' ) ) {
for( var j = 0, len2 = verticalSlides.length; j < len2; j++ ) {
var verticalIndex = i === indexh ? indexv : getPreviousVerticalIndex( hslide );
var verticalSlides = hslide.querySelectorAll( 'section' );
var vslide = verticalSlides[j];
for( var j = 0, len2 = verticalSlides.length; j < len2; j++ ) {
var verticalIndex = i === indexh ? indexv : getPreviousVerticalIndex( hslide );
vslide.setAttribute( 'data-index-h', i );
vslide.setAttribute( 'data-index-v', j );
var vslide = verticalSlides[j];
vslide.setAttribute( 'data-index-h', i );
vslide.setAttribute( 'data-index-v', j );
// Apply CSS transform
transformElement( vslide, 'translate(0%, ' + ( ( j - verticalIndex ) * 105 ) + '%)' );
// Navigate to this slide on click
vslide.addEventListener( 'click', onOverviewSlideClicked, true );
}
}
else {
// Apply CSS transform
transformElement( vslide, 'translate(0%, ' + ( ( j - verticalIndex ) * 105 ) + '%)' );
// Navigate to this slide on click
hslide.addEventListener( 'click', onOverviewSlideClicked, true );
vslide.addEventListener( 'click', onOverviewSlideClicked, true );
}
}
else {
updateSlidesVisibility();
// Navigate to this slide on click
hslide.addEventListener( 'click', onOverviewSlideClicked, true );
layout();
if( !wasActive ) {
// Notify observers of the overview showing
dispatchEvent( 'overviewshown', {
'indexh': indexh,
'indexv': indexv,
'currentSlide': currentSlide
} );
}
}
}, 10 );
updateSlidesVisibility();
layout();
if( !wasActive ) {
// Notify observers of the overview showing
dispatchEvent( 'overviewshown', {
'indexh': indexh,
'indexv': indexv,
'currentSlide': currentSlide
} );
}
}
@@ -1313,9 +1297,6 @@ var Reveal = (function(){
// Only proceed if enabled in config
if( config.overview ) {
clearTimeout( activateOverviewTimeout );
clearTimeout( deactivateOverviewTimeout );
dom.wrapper.classList.remove( 'overview' );
// Temporarily add a class so that transitions can do different things
@@ -1323,7 +1304,7 @@ var Reveal = (function(){
// moving from slide to slide
dom.wrapper.classList.add( 'overview-deactivating' );
deactivateOverviewTimeout = setTimeout( function () {
setTimeout( function () {
dom.wrapper.classList.remove( 'overview-deactivating' );
}, 1 );
+3 -3
View File
@@ -1,9 +1,9 @@
/*!
* reveal.js 2.7.0-dev (2014-03-25, 15:10)
* reveal.js 2.7.0-dev (2014-03-25, 17:44)
* http://lab.hakim.se/reveal-js
* MIT licensed
*
* Copyright (C) 2014 Hakim El Hattab, http://hakim.se
*/
var Reveal=function(){"use strict";function a(a){if(b(),!kc.transforms2d&&!kc.transforms3d)return document.body.setAttribute("class","no-transforms"),void 0;window.addEventListener("load",B,!1);var d=Reveal.getQueryHash();"undefined"!=typeof d.dependencies&&delete d.dependencies,k(fc,a),k(fc,d),s(),c()}function b(){kc.transforms3d="WebkitPerspective"in document.body.style||"MozPerspective"in document.body.style||"msPerspective"in document.body.style||"OPerspective"in document.body.style||"perspective"in document.body.style,kc.transforms2d="WebkitTransform"in document.body.style||"MozTransform"in document.body.style||"msTransform"in document.body.style||"OTransform"in document.body.style||"transform"in document.body.style,kc.requestAnimationFrameMethod=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame,kc.requestAnimationFrame="function"==typeof kc.requestAnimationFrameMethod,kc.canvas=!!document.createElement("canvas").getContext,_b=navigator.userAgent.match(/(iphone|ipod|android)/gi)}function c(){function a(){e.length&&head.js.apply(null,e),d()}function b(b){head.ready(b.src.match(/([\w\d_\-]*)\.?js$|[^\\\/]*$/i)[0],function(){"function"==typeof b.callback&&b.callback.apply(this),0===--f&&a()})}for(var c=[],e=[],f=0,g=0,h=fc.dependencies.length;h>g;g++){var i=fc.dependencies[g];(!i.condition||i.condition())&&(i.async?e.push(i.src):c.push(i.src),b(i))}c.length?(f=c.length,head.js.apply(null,c)):a()}function d(){e(),T(),h(),gb(),$(!0),setTimeout(function(){jc.slides.classList.remove("no-transition"),gc=!0,u("ready",{indexh:Wb,indexv:Xb,currentSlide:Zb})},1)}function e(){jc.theme=document.querySelector("#theme"),jc.wrapper=document.querySelector(".reveal"),jc.slides=document.querySelector(".reveal .slides"),jc.slides.classList.add("no-transition"),jc.background=f(jc.wrapper,"div","backgrounds",null),jc.progress=f(jc.wrapper,"div","progress","<span></span>"),jc.progressbar=jc.progress.querySelector("span"),f(jc.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),jc.slideNumber=f(jc.wrapper,"div","slide-number",""),f(jc.wrapper,"div","state-background",null),f(jc.wrapper,"div","pause-overlay",null),jc.controls=document.querySelector(".reveal .controls"),jc.controlsLeft=l(document.querySelectorAll(".navigate-left")),jc.controlsRight=l(document.querySelectorAll(".navigate-right")),jc.controlsUp=l(document.querySelectorAll(".navigate-up")),jc.controlsDown=l(document.querySelectorAll(".navigate-down")),jc.controlsPrev=l(document.querySelectorAll(".navigate-prev")),jc.controlsNext=l(document.querySelectorAll(".navigate-next"))}function f(a,b,c,d){var e=a.querySelector("."+c);return e||(e=document.createElement(b),e.classList.add(c),null!==d&&(e.innerHTML=d),a.appendChild(e)),e}function g(){function a(a,b){var c={background:a.getAttribute("data-background"),backgroundSize:a.getAttribute("data-background-size"),backgroundImage:a.getAttribute("data-background-image"),backgroundColor:a.getAttribute("data-background-color"),backgroundRepeat:a.getAttribute("data-background-repeat"),backgroundPosition:a.getAttribute("data-background-position"),backgroundTransition:a.getAttribute("data-background-transition")},d=document.createElement("div");return d.className="slide-background",c.background&&(/^(http|file|\/\/)/gi.test(c.background)||/\.(svg|png|jpg|jpeg|gif|bmp)$/gi.test(c.background)?d.style.backgroundImage="url("+c.background+")":d.style.background=c.background),(c.background||c.backgroundColor||c.backgroundImage)&&d.setAttribute("data-background-hash",c.background+c.backgroundSize+c.backgroundImage+c.backgroundColor+c.backgroundRepeat+c.backgroundPosition+c.backgroundTransition),c.backgroundSize&&(d.style.backgroundSize=c.backgroundSize),c.backgroundImage&&(d.style.backgroundImage='url("'+c.backgroundImage+'")'),c.backgroundColor&&(d.style.backgroundColor=c.backgroundColor),c.backgroundRepeat&&(d.style.backgroundRepeat=c.backgroundRepeat),c.backgroundPosition&&(d.style.backgroundPosition=c.backgroundPosition),c.backgroundTransition&&d.setAttribute("data-background-transition",c.backgroundTransition),b.appendChild(d),d}r()&&document.body.classList.add("print-pdf"),jc.background.innerHTML="",jc.background.classList.add("no-transition"),l(document.querySelectorAll(cc)).forEach(function(b){var c;c=r()?a(b,b):a(b,jc.background),l(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),fc.parallaxBackgroundImage?(jc.background.style.backgroundImage='url("'+fc.parallaxBackgroundImage+'")',jc.background.style.backgroundSize=fc.parallaxBackgroundSize,setTimeout(function(){jc.wrapper.classList.add("has-parallax-background")},1)):(jc.background.style.backgroundImage="",jc.wrapper.classList.remove("has-parallax-background"))}function h(a){var b=document.querySelectorAll(bc).length;if(jc.wrapper.classList.remove(fc.transition),"object"==typeof a&&k(fc,a),kc.trLine truncated
this.progressOffset+=.1*(1-this.progressOffset);var f=-Math.PI/2+a*2*Math.PI,g=-Math.PI/2+this.progressOffset*2*Math.PI;this.context.save(),this.context.clearRect(0,0,this.diameter,this.diameter),this.context.beginPath(),this.context.arc(c,d,b+2,0,2*Math.PI,!1),this.context.fillStyle="rgba( 0, 0, 0, 0.4 )",this.context.fill(),this.context.beginPath(),this.context.arc(c,d,b,0,2*Math.PI,!1),this.context.lineWidth=this.thickness,this.context.strokeStyle="#666",this.context.stroke(),this.playing&&(this.context.beginPath(),this.context.arc(c,d,b,g,f,!1),this.context.lineWidth=this.thickness,this.context.strokeStyle="#fff",this.context.stroke()),this.context.translate(c-e/2,d-e/2),this.playing?(this.context.fillStyle="#fff",this.context.fillRect(0,0,e/2-2,e),this.context.fillRect(e/2+2,0,e/2-2,e)):(this.context.beginPath(),this.context.translate(2,0),this.context.moveTo(0,0),this.context.lineTo(e-2,e/2),this.context.lineTo(0,e),this.context.fillStyle="#fff",this.context.fill()),this.context.restore()},Vb.prototype.on=function(a,b){this.canvas.addEventListener(a,b,!1)},Vb.prototype.off=function(a,b){this.canvas.removeEventListener(a,b,!1)},Vb.prototype.destroy=function(){this.playing=!1,this.canvas.parentNode&&this.container.removeChild(this.canvas)},{initialize:a,configure:h,sync:S,slide:R,left:tb,right:ub,up:vb,down:wb,prev:xb,next:yb,navigateFragment:mb,prevFragment:ob,nextFragment:nb,navigateTo:R,navigateLeft:tb,navigateRight:ub,navigateUp:vb,navigateDown:wb,navigatePrev:xb,navigateNext:yb,layout:B,availableRoutes:ab,availableFragments:bb,toggleOverview:H,togglePause:N,toggleAutoSlide:P,isOverview:I,isPaused:O,isAutoSliding:Q,addEventListeners:i,removeEventListeners:j,getState:jb,setState:kb,getProgress:eb,getIndices:ib,getSlide:function(a,b){var c=document.querySelectorAll(cc)[a],d=c&&c.querySelectorAll("section");return"undefined"!=typeof b?d?d[b]:void 0:c},getPreviousSlide:function(){return Yb},getCurrentSlide:function(){return Zb},getScale:function(){return ic},getConfig:function(){return fc},getQueryHash:function(){var a={};location.search.replace(/[A-Z0-9]+?=([\w\.%-]*)/gi,function(b){a[b.split("=").shift()]=b.split("=").pop()});for(var b in a){var c=a[b];a[b]=m(unescape(c))}return a},isFirstSlide:function(){return null==document.querySelector(bc+".past")?!0:!1},isLastSlide:function(){return Zb?Zb.nextElementSibling?!1:J(Zb)&&Zb.parentNode.nextElementSibling?!1:!0:!1},isReady:function(){return gc},addEventListener:function(a,b,c){"addEventListener"in window&&(jc.wrapper||document.querySelector(".reveal")).addEventListener(a,b,c)},removeEventListener:function(a,b,c){"addEventListener"in window&&(jc.wrapper||document.querySelector(".reveal")).removeEventListener(a,b,c)}}}();
var Reveal=function(){"use strict";function a(a){if(b(),!kc.transforms2d&&!kc.transforms3d)return document.body.setAttribute("class","no-transforms"),void 0;window.addEventListener("load",B,!1);var d=Reveal.getQueryHash();"undefined"!=typeof d.dependencies&&delete d.dependencies,k(fc,a),k(fc,d),s(),c()}function b(){kc.transforms3d="WebkitPerspective"in document.body.style||"MozPerspective"in document.body.style||"msPerspective"in document.body.style||"OPerspective"in document.body.style||"perspective"in document.body.style,kc.transforms2d="WebkitTransform"in document.body.style||"MozTransform"in document.body.style||"msTransform"in document.body.style||"OTransform"in document.body.style||"transform"in document.body.style,kc.requestAnimationFrameMethod=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame,kc.requestAnimationFrame="function"==typeof kc.requestAnimationFrameMethod,kc.canvas=!!document.createElement("canvas").getContext,_b=navigator.userAgent.match(/(iphone|ipod|android)/gi)}function c(){function a(){e.length&&head.js.apply(null,e),d()}function b(b){head.ready(b.src.match(/([\w\d_\-]*)\.?js$|[^\\\/]*$/i)[0],function(){"function"==typeof b.callback&&b.callback.apply(this),0===--f&&a()})}for(var c=[],e=[],f=0,g=0,h=fc.dependencies.length;h>g;g++){var i=fc.dependencies[g];(!i.condition||i.condition())&&(i.async?e.push(i.src):c.push(i.src),b(i))}c.length?(f=c.length,head.js.apply(null,c)):a()}function d(){e(),T(),h(),gb(),$(!0),setTimeout(function(){jc.slides.classList.remove("no-transition"),gc=!0,u("ready",{indexh:Wb,indexv:Xb,currentSlide:Zb})},1)}function e(){jc.theme=document.querySelector("#theme"),jc.wrapper=document.querySelector(".reveal"),jc.slides=document.querySelector(".reveal .slides"),jc.slides.classList.add("no-transition"),jc.background=f(jc.wrapper,"div","backgrounds",null),jc.progress=f(jc.wrapper,"div","progress","<span></span>"),jc.progressbar=jc.progress.querySelector("span"),f(jc.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),jc.slideNumber=f(jc.wrapper,"div","slide-number",""),f(jc.wrapper,"div","state-background",null),f(jc.wrapper,"div","pause-overlay",null),jc.controls=document.querySelector(".reveal .controls"),jc.controlsLeft=l(document.querySelectorAll(".navigate-left")),jc.controlsRight=l(document.querySelectorAll(".navigate-right")),jc.controlsUp=l(document.querySelectorAll(".navigate-up")),jc.controlsDown=l(document.querySelectorAll(".navigate-down")),jc.controlsPrev=l(document.querySelectorAll(".navigate-prev")),jc.controlsNext=l(document.querySelectorAll(".navigate-next"))}function f(a,b,c,d){var e=a.querySelector("."+c);return e||(e=document.createElement(b),e.classList.add(c),null!==d&&(e.innerHTML=d),a.appendChild(e)),e}function g(){function a(a,b){var c={background:a.getAttribute("data-background"),backgroundSize:a.getAttribute("data-background-size"),backgroundImage:a.getAttribute("data-background-image"),backgroundColor:a.getAttribute("data-background-color"),backgroundRepeat:a.getAttribute("data-background-repeat"),backgroundPosition:a.getAttribute("data-background-position"),backgroundTransition:a.getAttribute("data-background-transition")},d=document.createElement("div");return d.className="slide-background",c.background&&(/^(http|file|\/\/)/gi.test(c.background)||/\.(svg|png|jpg|jpeg|gif|bmp)$/gi.test(c.background)?d.style.backgroundImage="url("+c.background+")":d.style.background=c.background),(c.background||c.backgroundColor||c.backgroundImage)&&d.setAttribute("data-background-hash",c.background+c.backgroundSize+c.backgroundImage+c.backgroundColor+c.backgroundRepeat+c.backgroundPosition+c.backgroundTransition),c.backgroundSize&&(d.style.backgroundSize=c.backgroundSize),c.backgroundImage&&(d.style.backgroundImage='url("'+c.backgroundImage+'")'),c.backgroundColor&&(d.style.backgroundColor=c.backgroundColor),c.backgroundRepeat&&(d.style.backgroundRepeat=c.backgroundRepeat),c.backgroundPosition&&(d.style.backgroundPosition=c.backgroundPosition),c.backgroundTransition&&d.setAttribute("data-background-transition",c.backgroundTransition),b.appendChild(d),d}r()&&document.body.classList.add("print-pdf"),jc.background.innerHTML="",jc.background.classList.add("no-transition"),l(document.querySelectorAll(cc)).forEach(function(b){var c;c=r()?a(b,b):a(b,jc.background),l(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),fc.parallaxBackgroundImage?(jc.background.style.backgroundImage='url("'+fc.parallaxBackgroundImage+'")',jc.background.style.backgroundSize=fc.parallaxBackgroundSize,setTimeout(function(){jc.wrapper.classList.add("has-parallax-background")},1)):(jc.background.style.backgroundImage="",jc.wrapper.classList.remove("has-parallax-background"))}function h(a){var b=document.querySelectorAll(bc).length;if(jc.wrapper.classList.remove(fc.transition),"object"==typeof a&&k(fc,a),kc.trLine truncated
this.context.save(),this.context.clearRect(0,0,this.diameter,this.diameter),this.context.beginPath(),this.context.arc(c,d,b+2,0,2*Math.PI,!1),this.context.fillStyle="rgba( 0, 0, 0, 0.4 )",this.context.fill(),this.context.beginPath(),this.context.arc(c,d,b,0,2*Math.PI,!1),this.context.lineWidth=this.thickness,this.context.strokeStyle="#666",this.context.stroke(),this.playing&&(this.context.beginPath(),this.context.arc(c,d,b,g,f,!1),this.context.lineWidth=this.thickness,this.context.strokeStyle="#fff",this.context.stroke()),this.context.translate(c-e/2,d-e/2),this.playing?(this.context.fillStyle="#fff",this.context.fillRect(0,0,e/2-2,e),this.context.fillRect(e/2+2,0,e/2-2,e)):(this.context.beginPath(),this.context.translate(2,0),this.context.moveTo(0,0),this.context.lineTo(e-2,e/2),this.context.lineTo(0,e),this.context.fillStyle="#fff",this.context.fill()),this.context.restore()},Vb.prototype.on=function(a,b){this.canvas.addEventListener(a,b,!1)},Vb.prototype.off=function(a,b){this.canvas.removeEventListener(a,b,!1)},Vb.prototype.destroy=function(){this.playing=!1,this.canvas.parentNode&&this.container.removeChild(this.canvas)},{initialize:a,configure:h,sync:S,slide:R,left:tb,right:ub,up:vb,down:wb,prev:xb,next:yb,navigateFragment:mb,prevFragment:ob,nextFragment:nb,navigateTo:R,navigateLeft:tb,navigateRight:ub,navigateUp:vb,navigateDown:wb,navigatePrev:xb,navigateNext:yb,layout:B,availableRoutes:ab,availableFragments:bb,toggleOverview:H,togglePause:N,toggleAutoSlide:P,isOverview:I,isPaused:O,isAutoSliding:Q,addEventListeners:i,removeEventListeners:j,getState:jb,setState:kb,getProgress:eb,getIndices:ib,getSlide:function(a,b){var c=document.querySelectorAll(cc)[a],d=c&&c.querySelectorAll("section");return"undefined"!=typeof b?d?d[b]:void 0:c},getPreviousSlide:function(){return Yb},getCurrentSlide:function(){return Zb},getScale:function(){return ic},getConfig:function(){return fc},getQueryHash:function(){var a={};location.search.replace(/[A-Z0-9]+?=([\w\.%-]*)/gi,function(b){a[b.split("=").shift()]=b.split("=").pop()});for(var b in a){var c=a[b];a[b]=m(unescape(c))}return a},isFirstSlide:function(){return null==document.querySelector(bc+".past")?!0:!1},isLastSlide:function(){return Zb?Zb.nextElementSibling?!1:J(Zb)&&Zb.parentNode.nextElementSibling?!1:!0:!1},isReady:function(){return gc},addEventListener:function(a,b,c){"addEventListener"in window&&(jc.wrapper||document.querySelector(".reveal")).addEventListener(a,b,c)},removeEventListener:function(a,b,c){"addEventListener"in window&&(jc.wrapper||document.querySelector(".reveal")).removeEventListener(a,b,c)}}}();