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

rel: In teardown, only reset data-x/y/z attribute if we modified it.

Browse Source 
Fixes downstream bug in impressionist:
https://github.com/henrikingo/impressionist/issues/20
This commit is contained in:
Henrik Ingo
2019-06-27 06:58:48 +03:00
parent 628b78f3fd
commit 05cf6ffded
3 changed files with 58 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/rel/rel.js
View File

@@ -159,7 +159,10 @@
el: el,
x: el.getAttribute( "data-x" ),
y: el.getAttribute( "data-y" ),
z: el.getAttribute( "data-z" )
z: el.getAttribute( "data-z" ),
relX: el.getAttribute( "data-rel-x" ),
relY: el.getAttribute( "data-rel-y" ),
relZ: el.getAttribute( "data-rel-z" )
} );
var step = computeRelativePositions( el, prev );
@@ -181,20 +184,27 @@
var steps = startingState[ root.id ];
var step;
while ( step = steps.pop() ) {
if ( step.x === null ) {
step.el.removeAttribute( "data-x" );
} else {
step.el.setAttribute( "data-x", step.x );
// Reset x/y/z in cases where this plugin has changed it.
if ( step.relX !== null ) {
if ( step.x === null ) {
step.el.removeAttribute( "data-x" );
} else {
step.el.setAttribute( "data-x", step.x );
}
}
if ( step.y === null ) {
step.el.removeAttribute( "data-y" );
} else {
step.el.setAttribute( "data-y", step.y );
if ( step.relY !== null ) {
if ( step.y === null ) {
step.el.removeAttribute( "data-y" );
} else {
step.el.setAttribute( "data-y", step.y );
}
}
if ( step.z === null ) {
step.el.removeAttribute( "data-z" );
} else {
step.el.setAttribute( "data-z", step.z );
if ( step.relZ !== null ) {
if ( step.z === null ) {
step.el.removeAttribute( "data-z" );
} else {
step.el.setAttribute( "data-z", step.z );
}
}
}
delete startingState[ root.id ];