Support data-transition-duration attributes for step elements.

If the next element has its own data-transition-duration attribute, use that value instead of the global setting. References: impress#142
henrikingo · Oct 21, 2017 · a4197b1 · a4197b1
1 parent 7f4832e
commit a4197b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/js/impress.js b/js/impress.js
@@ -262,6 +262,9 @@
                         z: lib.util.toNumber( data.rotateZ || data.rotate )
                     },
                     scale: lib.util.toNumber( data.scale, 1 ),
+                    transitionDuration: lib.util.toNumber(
+                        data.transitionDuration, config.transitionDuration
+                    ),
                     el: el
                 };
 
@@ -311,7 +314,7 @@
                 minScale: lib.util.toNumber( rootData.minScale, defaults.minScale ),
                 perspective: lib.util.toNumber( rootData.perspective, defaults.perspective ),
                 transitionDuration: lib.util.toNumber(
-                  rootData.transitionDuration, defaults.transitionDuration
+                    rootData.transitionDuration, defaults.transitionDuration
                 )
             };
 
@@ -416,6 +419,7 @@
             window.scrollTo( 0, 0 );
 
             var step = stepsData[ "impress-" + el.id ];
+            duration = ( duration !== undefined ? duration : step.transitionDuration );
 
             // If we are in fact moving to another step, start with executing the registered
             // preStepLeave plugins.

diff --git a/src/impress.js b/src/impress.js
@@ -262,6 +262,9 @@
                         z: lib.util.toNumber( data.rotateZ || data.rotate )
                     },
                     scale: lib.util.toNumber( data.scale, 1 ),
+                    transitionDuration: lib.util.toNumber(
+                        data.transitionDuration, config.transitionDuration
+                    ),
                     el: el
                 };
 
@@ -311,7 +314,7 @@
                 minScale: lib.util.toNumber( rootData.minScale, defaults.minScale ),
                 perspective: lib.util.toNumber( rootData.perspective, defaults.perspective ),
                 transitionDuration: lib.util.toNumber(
-                  rootData.transitionDuration, defaults.transitionDuration
+                    rootData.transitionDuration, defaults.transitionDuration
                 )
             };
 
@@ -416,6 +419,7 @@
             window.scrollTo( 0, 0 );
 
             var step = stepsData[ "impress-" + el.id ];
+            duration = ( duration !== undefined ? duration : step.transitionDuration );
 
             // If we are in fact moving to another step, start with executing the registered
             // preStepLeave plugins.