reset animation-timing-function after animate()

References madrobby#577
abhishekbhalani · Sep 8, 2012 · b504b3f · b504b3f
1 parent b98ee62
commit b504b3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/fx.js b/src/fx.js
@@ -24,7 +24,8 @@
   clearProperties[prefix + 'transition-duration'] =
   clearProperties[prefix + 'transition-timing-function'] =
   clearProperties[prefix + 'animation-name'] =
-  clearProperties[prefix + 'animation-duration'] = ''
+  clearProperties[prefix + 'animation-duration'] =
+  clearProperties[prefix + 'animation-timing-function'] = ''
 
   $.fx = {
     off: (eventPrefix === undefined && testEl.style.transitionProperty === undefined),

diff --git a/test/fx.html b/test/fx.html
@@ -203,10 +203,12 @@ <h1>Zepto effects tests</h1>
 
       testKeyFrameAnimation: function(t){
         t.pause()
-        var el = $('#keyframetest').anim('animName', 2)
+        var el = $('#keyframetest').animate('animName', 200)
         defer(function(){
           t.resume(function(){
             t.assertStyle('animName', el, 'animation-name')
+            t.assertStyle('0.2s',     el, 'animation-duration')
+            t.assertStyle('linear',   el, 'animation-timing-function')
           })
         })
       }