janishutz-legacy/impress.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'impress:master' into v3

Browse Source
This commit is contained in:
Janis Hutz
2024-01-10 08:30:14 +01:00
committed by GitHub
parent 472e6d0f19 b3a7a632c7
commit 6a74c4e237
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/impress.js
View File

@@ -8,7 +8,7 @@
* in modern browsers and inspired by the idea behind prezi.com. * in modern browsers and inspired by the idea behind prezi.com.
* *
* *
* Copyright 2011-2012 Bartek Szopka (@bartaz), 2016-2023 Henrik Ingo (@henrikingo) * Copyright 2011-2012 Bartek Szopka (@bartaz), 2016-2023 Henrik Ingo (@henrikingo)
* and 70+ other contributors * and 70+ other contributors
* *
* Released under the MIT License. * Released under the MIT License.
@@ -4709,6 +4709,11 @@
currentSubstepOrder = el.dataset.substepOrder; currentSubstepOrder = el.dataset.substepOrder;
el.classList.add( "substep-visible" ); el.classList.add( "substep-visible" );
el.classList.add( "substep-active" ); el.classList.add( "substep-active" );
if ( currentSubstepOrder === undefined ) {
// Stop after one substep as default order
break;
}
} }
return el; return el;
@@ -4741,6 +4746,7 @@
// Continue if there is another substep with the same substepOrder // Continue if there is another substep with the same substepOrder
if ( current > 0 && if ( current > 0 &&
visible[ current ].dataset.substepOrder !== undefined &&
visible[ current - 1 ].dataset.substepOrder === visible[ current - 1 ].dataset.substepOrder ===
visible[ current ].dataset.substepOrder ) { visible[ current ].dataset.substepOrder ) {
visible.pop(); visible.pop();

6
src/plugins/substep/substep.js
View File

@@ -104,6 +104,11 @@
currentSubstepOrder = el.dataset.substepOrder; currentSubstepOrder = el.dataset.substepOrder;
el.classList.add( "substep-visible" ); el.classList.add( "substep-visible" );
el.classList.add( "substep-active" ); el.classList.add( "substep-active" );
if ( currentSubstepOrder === undefined ) {
// Stop after one substep as default order
break;
}
} }
return el; return el;
@@ -136,6 +141,7 @@
// Continue if there is another substep with the same substepOrder // Continue if there is another substep with the same substepOrder
if ( current > 0 && if ( current > 0 &&
visible[ current ].dataset.substepOrder !== undefined &&
visible[ current - 1 ].dataset.substepOrder === visible[ current - 1 ].dataset.substepOrder ===
visible[ current ].dataset.substepOrder ) { visible[ current ].dataset.substepOrder ) {
visible.pop(); visible.pop();