8000 Fixes to data-rel-to · JavaScriptExpert/impress.js@194ae3b · GitHub
[go: up one dir, main page]
Skip to content

Commit 194ae3b

Browse files
author
Henrik Ingo
committed
Fixes to data-rel-to
Fixes 80ffff0
1 parent 6707950 commit 194ae3b

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

‎examples/classic-slides/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
powerpoint slide show. The "slide" class is entirely optional and indeed you wouldn't use it for
102102
your cooler impress.js presentations.
103103
-->
104-
<div class="step slide title" data-x="-1000" data-y="-1500">
104+
<div id="title" class="step slide title" data-x="-1000" data-y="-1500">
105105
<h1>Example Presentation: <br />
106106
Classic Slides</h1>
107107
<h2>Henrik Ingo</h2>
@@ -114,7 +114,7 @@ <h3>2015</h3>
114114
</div>
115115
</div>
116116

117-
<div class="step slide" data-rel-x="1000" data-rel-y="0">
117+
<div id="toc" class="step slide" data-rel-x="1000" data-rel-y="0">
118118
<h1>Table of Contents</h1>
119119
<ul>
120120
<li><a href="#step-1">A title slide</a></li>
@@ -151,7 +151,7 @@ <h1>A slide with text</h1>
151151
</div>
152152
</div>
153153

154-
<div class="step slide">
154+
<div class="step slide" data-rel-to="title" data-y="2000">
155155
<h1>Bullet points</h1>
156156
<ul>
157157
<li>A slide with bullet points. This is the first point.</li>

‎examples/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ul><br />
77
<li><a href="2D-navigation/">2D-navigation</a></li>
88
<li><a href="3D-rotations/">3D-rotations</a></li>
9+
<li><a href="692/">692</a></li>
910
<li><a href="classic-slides/">classic-slides</a></li>
1011
<li><a href="cube/">cube</a></li>
1112
<li><a href="markdown/">markdown</a></li>

‎js/impress.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3566,7 +3566,7 @@
35663566
}
35673567
};
35683568

3569-
var computeRelativePositions = function( el, prev, root ) {
3569+
var computeRelativePositions = function( el, prev ) {
35703570
var data = el.dataset;
35713571

35723572
if ( !prev ) {
@@ -3577,14 +3577,14 @@
35773577

35783578
if ( data.relTo ) {
35793579

3580-
var ref = root.getElementById( data.relTo );
3580+
var ref = document.getElementById( data.relTo );
35813581
if ( ref ) {
35823582

35833583
// Test, if it is a previous step that already has some assigned position data
35843584
if ( el.compareDocumentPosition( ref ) & Node.DOCUMENT_POSITION_PRECEDING ) {
3585-
prev.x = ref.getAttribute( "data-x" );
3586-
prev.y = ref.getAttribute( "data-y" );
3587-
prev.z = ref.getAttribute( "data-z" );
3585+
prev.x = toNumber( ref.getAttribute( "data-x" ) );
3586+
prev.y = toNumber( ref.getAttribute( "data-y" ) );
3587+
prev.z = toNumber( ref.getAttribute( "data-z" ) );
35883588
prev.relative = {};
35893589
} else {
35903590
window.console.error(
@@ -3650,7 +3650,7 @@
36503650
y: el.getAttribute( "data-y" ),
36513651
z: el.getAttribute( "data-z" )
36523652
} );
3653-
var step = computeRelativePositions( el, prev, root );
3653+
var step = computeRelativePositions( el, prev );
36543654

36553655
// Apply relative position (if non-zero)
36563656
el.setAttribute( "data-x", step.x );

‎src/plugins/rel/rel.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878
};
7979

80-
var computeRelativePositions = function( el, prev, root ) {
80+
var computeRelativePositions = function( el, prev ) {
8181
var data = el.dataset;
8282

8383
if ( !prev ) {
@@ -88,14 +88,14 @@
8888

8989
if ( data.relTo ) {
9090

91-
var ref = root.getElementById( data.relTo );
91+
var ref = document.getElementById( data.relTo );
9292
if ( ref ) {
9393

9494
// Test, if it is a previous step that already has some assigned position data
9595
if ( el.compareDocumentPosition( ref ) & Node.DOCUMENT_POSITION_PRECEDING ) {
96-
prev.x = ref.getAttribute( "data-x" );
97-
prev.y = ref.getAttribute( "data-y" );
98-
prev.z = ref.getAttribute( "data-z" );
96+
prev.x = toNumber( ref.getAttribute( "data-x" ) );
97+
prev.y = toNumber( ref.getAttribute( "data-y" ) );
98+
prev.z = toNumber( ref.getAttribute( "data-z" ) );
9999
prev.relative = {};
100100
} else {
101101
window.console.error(
@@ -161,7 +161,7 @@
161161
y: el.getAttribute( "data-y" ),
162162
z: el.getAttribute( "data-z" )
163163
} );
164-
var step = computeRelativePositions( el, prev, root );
164+
var step = computeRelativePositions( el, prev );
165165

166166
// Apply relative position (if non-zero)
167167
el.setAttribute( "data-x", step.x );

0 commit comments

Comments
 (0)
0