xobs/fa23-si
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove need for dedicated data-auto-animate-unmatched attribute

Browse Source
This commit is contained in:
Hakim El Hattab 2020-02-18 20:23:37 +01:00
parent 4ff7fd3a71
commit 4eca625330
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/reveal.css
View File

@ -1233,10 +1233,10 @@ body {
/********************************************* /*********************************************
* AUTO ANIMATE * 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; } 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; } opacity: 1; }
/********************************************* /*********************************************

4
css/reveal.scss
View File

@ -1318,10 +1318,10 @@ $controlsArrowAngleActive: 36deg;
* AUTO ANIMATE * 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; 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; opacity: 1;
} }

12
js/reveal.js
View File

@ -3883,10 +3883,10 @@
// need to flag them // need to flag them
if( toSlide.dataset.autoAnimateUnmatched ) { if( toSlide.dataset.autoAnimateUnmatched ) {
getUnmatchedAutoAnimateElements( toSlide ).forEach( function( unmatchedElement ) { 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 // Setting the whole chunk of CSS at once is the most
@ -3918,10 +3918,6 @@
delete element.dataset.autoAnimateTarget; 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 * Returns a all elements within the given scope that should
* be considered unmatched in an auto-animate transition. If * be considered unmatched in an auto-animate transition. If
* fading of unmatched elements is turnded on, these elements * fading of unmatched elements is turned on, these elements
* will fade when going between auto-aniamted slides. * will fade when going between auto-animate slides.
* *
* Note that parents of auto-animate targets are NOT considerd * Note that parents of auto-animate targets are NOT considerd
* unmatched since fading them would break the auto-animation. * unmatched since fading them would break the auto-animation.