Permalink
Browse files

Renamed options to animationOptions

  • Loading branch information...
nvh committed Sep 13, 2016
1 parent 209fec6 commit 86c4fa9aeef74e6a53d2af22f457041caa04564b
Showing with 5 additions and 5 deletions.
  1. +2 −2 framer/Layer.coffee
  2. +2 −2 framer/LayerStates.coffee
  3. +1 −1 test/tests/LayerStatesTest.coffee
View
@@ -132,7 +132,7 @@ class exports.Layer extends BaseClass
if options.hasOwnProperty(p)
@[p] = options[p]
@options = {}
@animationOptions = {}
@_stateMachine = new LayerStateMachine(@)
@_context.emit("layer:create", @)
@@ -913,7 +913,7 @@ class exports.Layer extends BaseClass
properties = options.properties
delete options.properties
_.defaults(options,properties.options,@options)
_.defaults(options,properties.options,@animationOptions)
delete properties.options
animatableProperties = Animation.filterAnimatableProperties(properties)
@@ -68,9 +68,9 @@ class exports.LayerStates
layer.animate(last, options)
deprecatedProperty @, "animationOptions", null, stateMachine
, (layer) ->
layer.options
layer.animationOptions
, (layer, value) ->
layer.options = value
layer.animationOptions = value
deprecatedProperty @, "animatingKeys", null, stateMachine, (layer) ->
->
keys = []
@@ -383,7 +383,7 @@ describe "LayerStates", ->
describe "Options", ->
it "should listen to layer.options", ->
layer = new Layer
layer.options =
layer.animationOptions =
time: 4
animation = layer.animate
x: 100

0 comments on commit 86c4fa9

Please sign in to comment.