From 4eca6253303efebc2473998dfc0e2b594a6afad2 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 18 Feb 2020 20:23:37 +0100 Subject: [PATCH] remove need for dedicated data-auto-animate-unmatched attribute --- css/reveal.css | 4 ++-- css/reveal.scss | 4 ++-- js/reveal.js | 12 ++++-------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/css/reveal.css b/css/reveal.css index b1d4e75b..2ca3c6b7 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -1233,10 +1233,10 @@ body { /********************************************* * AUTO ANIMATE *********************************************/ -.reveal section[data-auto-animate] [data-auto-animate-unmatched="fade-in"] { +.reveal section[data-auto-animate] [data-auto-animate-target="unmatched"] { opacity: 0; } -.reveal section[data-auto-animate="running"] [data-auto-animate-unmatched="fade-in"] { +.reveal section[data-auto-animate="running"] [data-auto-animate-target="unmatched"] { opacity: 1; } /********************************************* diff --git a/css/reveal.scss b/css/reveal.scss index e0dacce5..101c6fbc 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -1318,10 +1318,10 @@ $controlsArrowAngleActive: 36deg; * AUTO ANIMATE *********************************************/ -.reveal section[data-auto-animate] [data-auto-animate-unmatched="fade-in"] { +.reveal section[data-auto-animate] [data-auto-animate-target="unmatched"] { opacity: 0; } -.reveal section[data-auto-animate="running"] [data-auto-animate-unmatched="fade-in"] { +.reveal section[data-auto-animate="running"] [data-auto-animate-target="unmatched"] { opacity: 1; } diff --git a/js/reveal.js b/js/reveal.js index 1f12b940..b585ed64 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -3883,10 +3883,10 @@ // need to flag them if( toSlide.dataset.autoAnimateUnmatched ) { getUnmatchedAutoAnimateElements( toSlide ).forEach( function( unmatchedElement ) { - unmatchedElement.dataset.autoAnimateUnmatched = 'fade-in'; + unmatchedElement.dataset.autoAnimateTarget = 'unmatched'; } ); - css.push( '.reveal [data-auto-animate="running"] [data-auto-animate-unmatched] { transition: all '+ (animationOptions.duration*0.8) +'s ease '+ (animationOptions.duration*0.2) +'s; }' ); + css.push( '.reveal [data-auto-animate="running"] [data-auto-animate-target="unmatched"] { transition: all '+ (animationOptions.duration*0.8) +'s ease '+ (animationOptions.duration*0.2) +'s; }' ); } // Setting the whole chunk of CSS at once is the most @@ -3918,10 +3918,6 @@ delete element.dataset.autoAnimateTarget; } ); - toArray( dom.wrapper.querySelectorAll( SLIDES_SELECTOR + ':not(.stack) [data-auto-animate-unmatched]' ) ).forEach( function( element ) { - delete element.dataset.autoAnimateUnmatched; - } ); - } /** @@ -4208,8 +4204,8 @@ /** * Returns a all elements within the given scope that should * be considered unmatched in an auto-animate transition. If - * fading of unmatched elements is turnded on, these elements - * will fade when going between auto-aniamted slides. + * fading of unmatched elements is turned on, these elements + * will fade when going between auto-animate slides. * * Note that parents of auto-animate targets are NOT considerd * unmatched since fading them would break the auto-animation.