Skip to content
Permalink
Browse files

🐳

  • Loading branch information
nvh committed Sep 27, 2016
1 parent 038d633 commit 6c5600f16c510445ad655e3497a5aed8160681f9
Showing with 7 additions and 7 deletions.
  1. +2 −2 framer/Animation.coffee
  2. +5 −5 test/tests/LayerAnimationTest.coffee
@@ -184,15 +184,15 @@ class exports.Animation extends BaseClass
@_delayTimer = Utils.delay(@options.delay, start)
else
start()

return true

stop: (emit=true) ->

if @_delayTimer?
Framer.CurrentContext.removeTimer(@_delayTimer)
@_delayTimer = null

@layer.context.removeAnimation(@)

@emit(Events.AnimationStop) if emit
@@ -146,15 +146,15 @@ describe "LayerAnimation", ->
done()

it "should not animate non-animatable properties that are set to null", ->

layerA = new Layer
layerB = new Layer parent: layerA

layerB.animate
parent: null
options:
instant: true

assert.equal(layerB.parent, layerA)


@@ -622,7 +622,7 @@ describe "LayerAnimation", ->
x: 100
options:
time: 0.1
onEnd: ->
onEnd: ->
layer.x.should.eql 100
done()

@@ -737,4 +737,4 @@ describe "LayerAnimation", ->
animation.options.curve.should.equal "linear"
animation.on Events.AnimationEnd, ->
layer.x.should.equal 10
done()
done()

0 comments on commit 6c5600f

Please sign in to comment.
You can’t perform that action at this time.