diff options
| author | hakimel | 2013-01-18 15:26:48 -0500 |
|---|---|---|
| committer | hakimel | 2013-01-18 15:26:48 -0500 |
| commit | 6a7d0cbcc930c4180e99fc3f1f8f2513ea9433d7 (patch) | |
| tree | 50f5c1f0e5c41074accb9508add8dddbb72abc71 /js/reveal.js | |
| parent | cd40e9e575683ac75cce8ba48cef45a97a3dd532 (diff) | |
| parent | 082e4ed1686747d9472c4448dc4387084f6238e2 (diff) | |
Merge branch 'fade-transition' of https://github.com/joelrbrandt/reveal.js
Diffstat (limited to 'js/reveal.js')
| -rw-r--r-- | js/reveal.js | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/js/reveal.js b/js/reveal.js index c33128d..8d829f9 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -51,11 +51,11 @@ var Reveal = (function(){ // Apply a 3D roll to links on hover rollingLinks: true, - // Transition style (see /css/theme) + // Theme (see /css/theme) theme: null, // Transition style - transition: 'default', // default/cube/page/concave/zoom/linear/none + transition: 'default', // default/cube/page/concave/zoom/linear/fade/none // Script dependencies to load dependencies: [] @@ -106,6 +106,9 @@ var Reveal = (function(){ // A delay used to ativate the overview mode activateOverviewTimeout = 0, + // A delay used to deativate the overview mode + deactivateOverviewTimeout = 0, + // Holds information about the currently ongoing touch input touch = { startX: 0, @@ -583,8 +586,9 @@ var Reveal = (function(){ if( config.overview ) { dom.wrapper.classList.add( 'overview' ); - + dom.wrapper.classList.remove( 'exit-overview' ); clearTimeout( activateOverviewTimeout ); + clearTimeout( deactivateOverviewTimeout ); // Not the pretties solution, but need to let the overview // class apply first so that slides are measured accurately @@ -655,8 +659,16 @@ var Reveal = (function(){ if( config.overview ) { clearTimeout( activateOverviewTimeout ); + clearTimeout( deactivateOverviewTimeout ); dom.wrapper.classList.remove( 'overview' ); + // Temporarily add a class so that transitions can do different things + // depending on whether they are exiting/entering overview, or just + // moving from slide to slide + dom.wrapper.classList.add( 'exit-overview' ); + deactivateOverviewTimeout = setTimeout( function () { + dom.wrapper.classList.remove( 'exit-overview' ); + }, 10); // Select all slides var slides = toArray( document.querySelectorAll( SLIDES_SELECTOR ) ); |