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

Allow multiple data-substep-order with the same value (#825)

Browse Source
This commit is contained in:
Falco Nogatz
2022-12-23 15:52:07 +01:00
committed by GitHub
parent 972dc413f3
commit 7817f12c12
2 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
js/impress.js
View File

@@ -4692,9 +4692,24 @@
for ( var i = 0; i < substeps.length; i++ ) { for ( var i = 0; i < substeps.length; i++ ) {
substeps[ i ].classList.remove( "substep-active" ); substeps[ i ].classList.remove( "substep-active" );
} }
var el = substeps[ visible.length ];
el.classList.add( "substep-visible" ); // Loop over all substeps that are not yet visible and set
el.classList.add( "substep-active" ); // those of currentSubstepOrder to visible and active
var el;
var currentSubstepOrder;
for ( var j = visible.length; j < substeps.length; j++ ) {
if ( currentSubstepOrder &&
currentSubstepOrder !== substeps[ j ].dataset.substepOrder ) {
// Stop if the substepOrder is greater
break;
}
el = substeps[ j ];
currentSubstepOrder = el.dataset.substepOrder;
el.classList.add( "substep-visible" );
el.classList.add( "substep-active" );
}
return el; return el;
} }
}; };
@@ -4722,6 +4737,14 @@
} }
var el = visible[ visible.length - 1 ]; var el = visible[ visible.length - 1 ];
el.classList.remove( "substep-visible" ); el.classList.remove( "substep-visible" );
// Continue if there is another substep with the same substepOrder
if ( current > 0 &&
visible[ current - 1 ].dataset.substepOrder ===
visible[ current ].dataset.substepOrder ) {
visible.pop();
return hideSubstep( visible );
}
return el; return el;
} }
}; };

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

@@ -88,9 +88,24 @@
for ( var i = 0; i < substeps.length; i++ ) { for ( var i = 0; i < substeps.length; i++ ) {
substeps[ i ].classList.remove( "substep-active" ); substeps[ i ].classList.remove( "substep-active" );
} }
var el = substeps[ visible.length ];
el.classList.add( "substep-visible" ); // Loop over all substeps that are not yet visible and set
el.classList.add( "substep-active" ); // those of currentSubstepOrder to visible and active
var el;
var currentSubstepOrder;
for ( var j = visible.length; j < substeps.length; j++ ) {
if ( currentSubstepOrder &&
currentSubstepOrder !== substeps[ j ].dataset.substepOrder ) {
// Stop if the substepOrder is greater
break;
}
el = substeps[ j ];
currentSubstepOrder = el.dataset.substepOrder;
el.classList.add( "substep-visible" );
el.classList.add( "substep-active" );
}
return el; return el;
} }
}; };
@@ -118,6 +133,14 @@
} }
var el = visible[ visible.length - 1 ]; var el = visible[ visible.length - 1 ];
el.classList.remove( "substep-visible" ); el.classList.remove( "substep-visible" );
// Continue if there is another substep with the same substepOrder
if ( current > 0 &&
visible[ current - 1 ].dataset.substepOrder ===
visible[ current ].dataset.substepOrder ) {
visible.pop();
return hideSubstep( visible );
}
return el; return el;
} }
}; };