Merge branch 'impress:master' into v3
This commit is contained in:
@@ -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();
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
Reference in New Issue
Block a user