From 59c9b3c5968a167acb2814aeff32eb208df23e66 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Sat, 17 Dec 2011 12:55:25 -0800 Subject: [PATCH] fragments now work in vertical slides (fixes #4) --- css/main.css | 2 +- js/reveal.js | 42 ++++++++++++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/css/main.css b/css/main.css index 40806d3..d2ab138 100644 --- a/css/main.css +++ b/css/main.css @@ -364,7 +364,7 @@ a:not(.image) { border-radius: 2px; } -img { +section img { margin: 30px 0 0 0; background: rgba(255,255,255,0.12); border: 4px solid #eee; diff --git a/js/reveal.js b/js/reveal.js index 6ce7a89..335e619 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -358,13 +358,20 @@ var Reveal = (function(){ * @return {Boolean} true if there was a next fragment, * false otherwise */ - function nextFragment() { - var fragments = document.querySelectorAll( '.present .fragment:not(.visible)' ); - - if( fragments.length ) { - fragments[0].classList.add( 'visible' ); - - return true; + function nextFragment() { + if( document.querySelector( VERTICAL_SLIDES_SELECTOR + '.present' ) ) { + var verticalFragments = document.querySelectorAll( VERTICAL_SLIDES_SELECTOR + '.present .fragment:not(.visible)' ); + if( verticalFragments.length ) { + verticalFragments[0].classList.add( 'visible' ); + return true; + } + } + else { + var horizontalFragments = document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR + '.present .fragment:not(.visible)' ); + if( horizontalFragments.length ) { + horizontalFragments[0].classList.add( 'visible' ); + return true; + } } return false; @@ -377,14 +384,21 @@ var Reveal = (function(){ * false otherwise */ function previousFragment() { - var fragments = document.querySelectorAll( '.present .fragment.visible' ); - - if( fragments.length ) { - fragments[ fragments.length - 1 ].classList.remove( 'visible' ); - - return true; + if( document.querySelector( VERTICAL_SLIDES_SELECTOR + '.present' ) ) { + var verticalFragments = document.querySelectorAll( VERTICAL_SLIDES_SELECTOR + '.present .fragment.visible' ); + if( verticalFragments.length ) { + verticalFragments[ verticalFragments.length - 1 ].classList.remove( 'visible' ); + return true; + } } - + else { + var horizontalFragments = document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR + '.present .fragment.visible' ); + if( horizontalFragments.length ) { + horizontalFragments[ horizontalFragments.length - 1 ].classList.remove( 'visible' ); + return true; + } + } + return false; }