Renamed options to animationOptions

koenbok · Sep 15, 2016 · 86c4fa9 · 86c4fa9
1 parent 209fec6
commit 86c4fa9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/framer/Layer.coffee b/framer/Layer.coffee
@@ -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)

diff --git a/framer/LayerStates.coffee b/framer/LayerStates.coffee
@@ -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 = []

diff --git a/test/tests/LayerStatesTest.coffee b/test/tests/LayerStatesTest.coffee
@@ -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