diff --git a/js/impress.js b/js/impress.js index 1ed77cd8e..e7a0dee45 100644 --- a/js/impress.js +++ b/js/impress.js @@ -4131,9 +4131,9 @@ // Test, if it is a previous step that already has some assigned position data if ( el.compareDocumentPosition( ref ) & Node.DOCUMENT_POSITION_PRECEDING ) { - prev.x = toNumber( ref.getAttribute( "data-x" ) ); - prev.y = toNumber( ref.getAttribute( "data-y" ) ); - prev.z = toNumber( ref.getAttribute( "data-z" ) ); + prev.x = toNumberAdvanced( ref.getAttribute( "data-x" ) ); + prev.y = toNumberAdvanced( ref.getAttribute( "data-y" ) ); + prev.z = toNumberAdvanced( ref.getAttribute( "data-z" ) ); var prevPosition = ref.getAttribute( "data-rel-position" ) || "absolute"; @@ -4214,9 +4214,9 @@ } var step = { - x: toNumber( data.x, prev.x ), - y: toNumber( data.y, prev.y ), - z: toNumber( data.z, prev.z ), + x: toNumberAdvanced( data.x, prev.x ), + y: toNumberAdvanced( data.y, prev.y ), + z: toNumberAdvanced( data.z, prev.z ), rotate: { x: toNumber( data.rotateX, 0 ), y: toNumber( data.rotateY, 0 ), diff --git a/src/plugins/rel/rel.js b/src/plugins/rel/rel.js index 16778fe27..65aef19f6 100644 --- a/src/plugins/rel/rel.js +++ b/src/plugins/rel/rel.js @@ -79,9 +79,9 @@ // Test, if it is a previous step that already has some assigned position data if ( el.compareDocumentPosition( ref ) & Node.DOCUMENT_POSITION_PRECEDING ) { - prev.x = toNumber( ref.getAttribute( "data-x" ) ); - prev.y = toNumber( ref.getAttribute( "data-y" ) ); - prev.z = toNumber( ref.getAttribute( "data-z" ) ); + prev.x = toNumberAdvanced( ref.getAttribute( "data-x" ) ); + prev.y = toNumberAdvanced( ref.getAttribute( "data-y" ) ); + prev.z = toNumberAdvanced( ref.getAttribute( "data-z" ) ); var prevPosition = ref.getAttribute( "data-rel-position" ) || "absolute"; @@ -162,9 +162,9 @@ } var step = { - x: toNumber( data.x, prev.x ), - y: toNumber( data.y, prev.y ), - z: toNumber( data.z, prev.z ), + x: toNumberAdvanced( data.x, prev.x ), + y: toNumberAdvanced( data.y, prev.y ), + z: toNumberAdvanced( data.z, prev.z ), rotate: { x: toNumber( data.rotateX, 0 ), y: toNumber( data.rotateY, 0 ), diff --git a/test/plugins/rel/relative_to_screen_size_tests.js b/test/plugins/rel/relative_to_screen_size_tests.js index 6d242b2b7..fb90dc095 100644 --- a/test/plugins/rel/relative_to_screen_size_tests.js +++ b/test/plugins/rel/relative_to_screen_size_tests.js @@ -15,6 +15,7 @@ QUnit.test( "relative_to_screen_size", function( assert ) { var step1 = iframeDoc.querySelector( "div#step1" ); var step2 = iframeDoc.querySelector( "div#step2" ); var step3 = iframeDoc.querySelector( "div#step3" ); + var overview = iframeDoc.querySelector( "div#overview" ); assert.equal( origin.dataset.x, 0, "origin data-x attribute" ); assert.equal( origin.dataset.y, 0, "origin data-y attribute" ); @@ -32,6 +33,10 @@ QUnit.test( "relative_to_screen_size", function( assert ) { assert.equal( step3.dataset.y, -750, "step3 data-y attribute" ); assert.equal( step3.dataset.z, 1000, "step3 data-z attribute" ); + assert.equal( overview.dataset.x, 2000, "overview data-x attribute" ); + assert.equal( overview.dataset.y, -1500, "overview data-y attribute" ); + assert.equal( overview.dataset.z, 1500, "overview data-z attribute" ); + done(); console.log( "End relative_to_screen_size test (sync)" ); } ) diff --git a/test/plugins/rel/relative_to_screen_size_tests_presentation.html b/test/plugins/rel/relative_to_screen_size_tests_presentation.html index f2f793e14..df6afdd60 100644 --- a/test/plugins/rel/relative_to_screen_size_tests_presentation.html +++ b/test/plugins/rel/relative_to_screen_size_tests_presentation.html @@ -37,7 +37,7 @@
-
+