Skip to content

Commit e9b0f5b

Browse files
committed
minor refactoring of overview code
1 parent cf8b004 commit e9b0f5b

4 files changed

Lines changed: 14 additions & 20 deletions

File tree

css/reveal.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,8 +1050,8 @@ body {
10501050

10511051
.reveal.fade.overview .slides section,
10521052
.reveal.fade.overview .slides>section>section,
1053-
.reveal.fade.exit-overview .slides section,
1054-
.reveal.fade.exit-overview .slides>section>section {
1053+
.reveal.fade.overview-deactivating .slides section,
1054+
.reveal.fade.overview-deactivating .slides>section>section {
10551055
-webkit-transition: none;
10561056
-moz-transition: none;
10571057
-ms-transition: none;

css/reveal.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/reveal.js

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,15 +1156,15 @@ var Reveal = (function(){
11561156
var depth = window.innerWidth < 400 ? 1000 : 2500;
11571157

11581158
dom.wrapper.classList.add( 'overview' );
1159-
dom.wrapper.classList.remove( 'exit-overview' );
1159+
dom.wrapper.classList.remove( 'overview-deactivating' );
11601160

11611161
clearTimeout( activateOverviewTimeout );
11621162
clearTimeout( deactivateOverviewTimeout );
11631163

11641164
// Not the pretties solution, but need to let the overview
11651165
// class apply first so that slides are measured accurately
11661166
// before we can position them
1167-
activateOverviewTimeout = setTimeout( function(){
1167+
activateOverviewTimeout = setTimeout( function() {
11681168

11691169
var horizontalSlides = document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR );
11701170

@@ -1241,25 +1241,19 @@ var Reveal = (function(){
12411241
// Temporarily add a class so that transitions can do different things
12421242
// depending on whether they are exiting/entering overview, or just
12431243
// moving from slide to slide
1244-
dom.wrapper.classList.add( 'exit-overview' );
1244+
dom.wrapper.classList.add( 'overview-deactivating' );
12451245

12461246
deactivateOverviewTimeout = setTimeout( function () {
1247-
dom.wrapper.classList.remove( 'exit-overview' );
1248-
}, 10);
1247+
dom.wrapper.classList.remove( 'overview-deactivating' );
1248+
}, 1 );
12491249

12501250
// Select all slides
1251-
var slides = toArray( document.querySelectorAll( SLIDES_SELECTOR ) );
1252-
1253-
for( var i = 0, len = slides.length; i < len; i++ ) {
1254-
var element = slides[i];
1255-
1256-
element.style.display = '';
1257-
1251+
toArray( document.querySelectorAll( SLIDES_SELECTOR ) ).forEach( function( slide ) {
12581252
// Resets all transforms to use the external styles
1259-
transformElement( element, '' );
1253+
transformElement( slide, '' );
12601254

1261-
element.removeEventListener( 'click', onOverviewSlideClicked, true );
1262-
}
1255+
slide.removeEventListener( 'click', onOverviewSlideClicked, true );
1256+
} );
12631257

12641258
slide( indexh, indexv );
12651259

0 commit comments

Comments
 (0)