make data-rel-reset="all" ignore the rotation of previous slide

impress · Mar 19, 2022 · 3bbda65 · 3bbda65
1 parent d114736
commit 3bbda65
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/js/impress.js b/js/impress.js
@@ -4214,7 +4214,7 @@
         // The final relatives maybe or maybe not the same with orignal data-rel-*
         var relative = step.relative;
 
-        if ( step.relative.position === "relative" ) {
+        if ( step.relative.position === "relative" && inheritRotation ) {
 
             // Calculate relatives based on previous slide
             relative = api.lib.rotation.translateRelative(

diff --git a/src/plugins/rel/rel.js b/src/plugins/rel/rel.js
@@ -161,7 +161,7 @@
         // The final relatives maybe or maybe not the same with orignal data-rel-*
         var relative = step.relative;
 
-        if ( step.relative.position === "relative" ) {
+        if ( step.relative.position === "relative" && inheritRotation ) {
 
             // Calculate relatives based on previous slide
             relative = api.lib.rotation.translateRelative(

diff --git a/test/plugins/rel/padding_tests.js b/test/plugins/rel/padding_tests.js
@@ -31,6 +31,8 @@ QUnit.test( "padding_relative", function( assert ) {
       var z_y = iframeDoc.querySelector( "div#z_y" );
       var z_z = iframeDoc.querySelector( "div#z_z" );
 
+      var reset = iframeDoc.querySelector( "div#reset" );
+
       assert.close( origin.dataset.x, 0, 1, "origin data-x attribute" );
       assert.close( origin.dataset.y, 0, 1, "origin data-y attribute" );
       assert.close( origin.dataset.z, 0, 1, "origin data-z attribute" );
@@ -143,6 +145,13 @@ QUnit.test( "padding_relative", function( assert ) {
       assert.close( z_z.dataset.rotateY, 0, 1, "z_z data-rotate-y" );
       assert.close( z_z.dataset.rotateZ, 90, 1, "z_z data-rotate-z" );
 
+      assert.close( reset.dataset.x, 100, 1, "reset data-x attribute" );
+      assert.close( reset.dataset.y, 200, 1, "reset data-y attribute" );
+      assert.close( reset.dataset.z, 800, 1, "reset data-z attribute" );
+      assert.close( reset.dataset.rotateX, 0, 1, "reset data-rotate-x" );
+      assert.close( reset.dataset.rotateY, 0, 1, "reset data-rotate-y" );
+      assert.close( reset.dataset.rotateZ, 0, 1, "reset data-rotate-z" );
+
       done();
       console.log( "End padding test (sync)" );
     } )

diff --git a/test/plugins/rel/padding_tests_presentation.html b/test/plugins/rel/padding_tests_presentation.html
@@ -52,6 +52,10 @@
       <div id="z_y" class="step" data-rel-reset data-rel-to="z" data-rel-y="500"></div>
       <div id="z_z" class="step" data-rel-reset data-rel-to="z" data-rel-z="500"></div>
 
+      <div id="reset" class="step" data-rel-reset="all" data-rel-x="100" data-rel-y="200" data-rel-z="300">
+          by data prel-reset="all", paddings should be calculated as if data-rotate-*=0
+      </div>
+
       <div id="overview" class="step overview" data-x="0" data-y="-1000" data-z="100" data-scale="4" data-rotate-x="45">
       </div>