Permalink
Browse files

Add `layer.options` to replace `layer.states.animationOptions`

  • Loading branch information...
nvh committed Jul 26, 2016
1 parent 16a3107 commit dd49a2e92483581baae79ab9e1ad5ea88f45dece
Showing with 3 additions and 2 deletions.
  1. +3 −2 framer/Layer.coffee
View
@@ -132,6 +132,7 @@ class exports.Layer extends BaseClass
if options.hasOwnProperty(p)
@[p] = options[p]
@options = {}
@_stateMachine = new LayerStateMachine(@)
@_context.emit("layer:create", @)
@@ -905,7 +906,7 @@ class exports.Layer extends BaseClass
stateName = properties
return @animateToState stateName, options
_.defaults(options,properties.options)
_.defaults(options,properties.options,@options)
delete properties.options
animatableProperties = Animation.filterAnimatableProperties(properties)
@@ -1298,7 +1299,7 @@ class exports.Layer extends BaseClass
# Don't show any hints while we are animating
if @isAnimating
return false
return false
for parent in @ancestors()
return false if parent.isAnimating

0 comments on commit dd49a2e

Please sign in to comment.