impressive typo/bug fixed

and BTW, firefox doesn't understand transition delay of 0, he needs 0ms... orly?
2011-12-31 10:23:34 +01:00
parent da7a27d44e
commit ec069e1732
2 changed files with 13 additions and 15 deletions
--- a/js/impress.js
+++ b/js/impress.js
@@ -184,18 +184,16 @@
            }
        };

-        var zoomin = target.scale.x > current.scale.x ||
-                     target.scale.y > current.scale.y ||
-                     target.scale.z > current.scale.z;
+        var zoomin = target.scale.x >= current.scale.x;
        
        css(impress, {
            transform: scale(target.scale),
-            transitionDelay: (zoomin ? "300ms" : "0")
+            transitionDelay: (zoomin ? "500ms" : "0ms")
        });
        
        css(canvas, {
            transform: rotate(target.rotate, true) + translate(target.translate),
-            transformDelay: (zoomin ? "0" : "300ms")
+            transitionDelay: (zoomin ? "0ms" : "500ms")
        });
        
        current = target;