Skip to content
Browse files

Renamed parameters to properties

Signed-off-by: Niels van Hoorn <>
  • Loading branch information
nvh committed Sep 15, 2016
1 parent 40b20be commit 07040f244b0d3548fa98521938ca4f1ef44a132f
Showing with 6 additions and 6 deletions.
  1. +6 −6 framer/
@@ -35,19 +35,19 @@ evaluateRelativeProperty = (target, k, v) ->

class exports.Animation extends BaseClass

_.defaults(options, parameters.options)
# 'properties' are the layer properties that will be animated
# 'options' are the animationOptions for this animation
# It's also possible to provide options through an 'options' key in the 'properties object'
constructor: (properties={}, options={}) ->
_.defaults(options, properties.options)

delete parameters.options
delete properties.options
@options = _.cloneDeep Defaults.getDefaults "Animation", options
super parameters
@layer = parameters.layer ? null
@properties = Animation.filterAnimatableProperties(parameters)
super properties
@layer = properties.layer ? null
@properties = Animation.filterAnimatableProperties(properties)

if parameters.origin
if properties.origin
console.warn "Animation.origin: please use layer.originX and layer.originY"


0 comments on commit 07040f2

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