Merge pull request #420 from koenbok/animation-api-refactor

Animation API refactor

framer/Animation.coffee

@@ -44,30 +44,30 @@ class exports.Animation extends BaseClass
 		# 	properties:
 		# 		x: 100
 
-		# print args
-
 		layer = null
 		properties = {}
 		options = {}
 
+		# Actual current api
 		if arguments.length is 3
 			layer = args[0]
 			properties = args[1]
 			options = args[2]
 
+		# Mix of current and old api
 		if arguments.length is 2
 			layer = args[0]
-			if args[1].properties
+			if args[1].properties?
 				properties = args[1].properties
 			else
 				properties = args[1]
-			options = args[1].options if args[1].options
-
+			options = args[1].options if args[1].options?
 
+		# Old api
 		if arguments.length is 1
 			layer = args[0].layer
 			properties = args[0].properties
-			if args[0].options
+			if args[0].options?
 				options = args[0].options
 			else
 				options = args[0]
@@ -76,9 +76,6 @@ class exports.Animation extends BaseClass
 		delete options.properties
 		delete options.options
 
-
-		# print "Animation", layer, properties, options
-
 		@options = _.cloneDeep(Defaults.getDefaults("Animation", options))
 
 		super
@@ -162,6 +159,11 @@ class exports.Animation extends BaseClass
 			console.log "Animation.start"
 			console.log "\t#{k}: #{@_stateA[k]} -> #{@_stateB[k]}" for k, v of @_stateB
 
+		# Add the callbacks
+		@on(Events.AnimationStart, @options.onStart) if _.isFunction(@options.onStart)
+		@on(Events.AnimationStop, @options.onStop) if _.isFunction(@options.onStop)
+		@on(Events.AnimationEnd, @options.onEnd) if _.isFunction(@options.onEnd)
+
 		# See if we need to repeat this animation
 		# Todo: more repeat behaviours:
 		# 1) add (from end position) 2) reverse (loop between a and b)

framer/Extras/TouchEmulator.coffee

@@ -195,6 +195,7 @@ class TouchEmulator extends BaseClass
 				curve: "ease-out"
 
 	hideTouchCursor: ->
+		return unless @touchPointLayer.opacity > 0
 		@touchPointLayer.animateStop()
 		@touchPointLayer.animate
 			opacity: 0

framer/Layer.coffee

@@ -11,7 +11,7 @@ Utils = require "./Utils"
 {Matrix} = require "./Matrix"
 {Animation} = require "./Animation"
 {LayerStyle} = require "./LayerStyle"
-{LayerStateMachine} = require "./LayerStateMachine"
+{LayerStates} = require "./LayerStates"
 {LayerDraggable} = require "./LayerDraggable"
 {LayerPinchable} = require "./LayerPinchable"
 {Gestures} = require "./Gestures"
@@ -139,7 +139,6 @@ class exports.Layer extends BaseClass
 				@[p] = options[p]
 
 		@animationOptions = {}
-		@_stateMachine = new LayerStateMachine(@)
 		@_context.emit("layer:create", @)
 
 		delete @__constructor
@@ -893,30 +892,29 @@ class exports.Layer extends BaseClass
 	##############################################################
 	## ANIMATION
 
-	# Used to animate to a state with a specific name
-	# We lookup the stateName and call 'animate' with the properties of the state
-	animateToState: (stateName, options={}) ->
-		return @_stateMachine.switchTo(stateName, options)
-
 	animate: (properties, options={}) ->
 
-		# print "layer.animate", properties, options
-
 		# If the properties are a string, we assume it's a state name
 		if _.isString(properties)
-			return @animateToState(properties, options)
+
+			stateName = properties
+
+			# Support options as an object
+			options = options.options if options.options?
+
+			return @states.machine.switchTo(stateName, options)
 
 		# Support the old properties syntax, we add all properties top level and
 		# move the options into an options property.
-		if properties.hasOwnProperty("properties")
+		if properties.properties?
 			options = properties
 			properties = options.properties
 			delete options.properties
 
 		# With the new api we treat the properties as animatable properties, and use
 		# the special options keyword for animation options.
-		if properties.hasOwnProperty("options")
-			options = _.defaults(properties.options, options)
+		if properties.options?
+			options = _.defaults({}, options, properties.options)
 			delete properties.options
 
 		# Merge the animation options with the default animation options for this layer
@@ -928,13 +926,14 @@ class exports.Layer extends BaseClass
 
 		return animation
 
-	switchInstant: (properties, options={}) ->
-		@animate(properties, _.merge(options, {instant: true}))
-
-	animateToNextState: (args..., options={}) ->
+	stateCycle: (args..., options={}) ->
 		states = []
 		states = _.flatten(args) if args.length
-		@animate(@_stateMachine.next(states), options)
+		@animate(@states.machine.next(states), options)
+
+	stateSwitch: (stateName, options={}) ->
+		return @animate(stateName, options) if options.animate is true
+		return @animate(stateName, _.defaults({}, options, {instant:true}))
 
 	animations: ->
 		# Current running animations on this layer
@@ -994,17 +993,18 @@ class exports.Layer extends BaseClass
 		enumerable: false
 		exportable: false
 		importable: false
-		get: -> @_stateMachine.states
+		get: ->
+			@_states ?= new LayerStates(@)
+			return @_states
 		set: (states) ->
-			@_stateMachine.reset()
-			for name, state of states
-				@_stateMachine.states[name] = state
+			@states.machine.reset()
+			_.extend(@states, states)
 
 	@define "stateNames",
 		enumerable: false
 		exportable: false
 		importable: false
-		get: -> @_stateMachine.stateNames
+		get: -> @states.machine.stateNames
 
 	#############################################################################
 	## Draggable, Pinchable

framer/LayerStateMachine.coffee

@@ -1,47 +1,46 @@
-# {_} = require "./Underscore"
-#
-# {Events} = require "./Events"
 {BaseClass} = require "./BaseClass"
-# {Defaults} = require "./Defaults"
-
-{LayerStates} = require "./LayerStates"
 
 class exports.LayerStateMachine extends BaseClass
 
-	constructor: (layer) ->
+	constructor: (@_layer, @_states) ->
 		super
-		@_layer = layer
-		@properties = {}
-		@initial = LayerStates.filterStateProperties(layer.props)
+
 		@reset()
 
 	@define "layer",
 		get: -> @_layer
 
 	@define "current",
-		get: -> @states[@currentName]
+		get: -> @currentName
+
+	@define "previous",
+		get: -> @previousName
+
 
 	@define "currentName",
 		get: -> @_currentName
 
-	@define "previous",
-		get: -> @states[@previousName]
-
 	@define "previousName",
-		get: -> _.last(@_previousNames)
+		get: -> _.last(@_previousNames) or "default"
 
 	@define "stateNames",
-		get: -> _.keys(@states)
+		get: -> Object.keys(@states)
+
+	@define "states",
+		get: -> @_states
+
+	switchInstant: (stateName) ->
+		@switchTo(stateName, {instant: true})
 
 	switchTo: (stateName, options={}) ->
-		
+
 		# Check if the state exists, if not this is a pretty serious error
-		throw Error "No such state: '#{stateName}'" unless @states.hasOwnProperty(stateName)
+		throw Error "No such state: '#{stateName}'" unless @states[stateName]
 
 		# Prep the properties and the options. The options come from the state, and can be overriden
 		# with the function arguments here.
 		properties = @states[stateName]
-		options = _.defaults(properties.options, options) if properties.options
+		options = _.defaults({}, options, properties.options) if properties.options
 
 		stateNameA = @currentName
 		stateNameB = stateName
@@ -84,12 +83,21 @@ class exports.LayerStateMachine extends BaseClass
 			states = @stateNames
 		Utils.arrayNext(states, @currentName)
 
+	emit: (args...) ->
+		super
+		# Also emit this to the layer with self as argument
+		@_layer.emit args...
+
 	reset: ->
-		@states = new LayerStates(@)
+
+		for k in _.keys(@states)
+			delete @states[k] unless k is "default"
+
 		@_previousNames = []
-		@_currentName = _.first(@stateNames)
+		@_currentName = "default"
 
-	emit: (args...) ->
-			super
-			# Also emit this to the layer with self as argument
-			@_layer.emit args...
+	# _namedState: (name) ->
+	# 	return _.extend(_.clone(@states[name]), {name: name})
+
+	toInspect: (constructor) ->
+		return "<#{@constructor.name} id:#{@id} layer:#{@layer.id} current:'#{@currentName}'>"