 			@phone.scale = phoneScale
 			@phone.center()
 
-		@emit("change:deviceZoom")
+		@emit("change:deviceScale")
 			
 
 	_calculatePhoneScale: ->
 		
 		# Calculates a phone scale that fits the screen unless a fixed value is set
 		
-		if @_deviceZoom and @_deviceZoom isnt "fit"
-			return @_deviceZoom
+		if @_deviceScale and @_deviceScale isnt "fit"
+			return @_deviceScale
 
 		[width, height] = @_getOrientationDimensions(@phone.width, @phone.height)
 

Device.rotateLeft()
Device.rotateRight()

Device.setDeviceZoom(zoom:float, animate:bool)
Device.setContentZoom(zoom:float, animate:bool)

Device.keyboard bool
Device.setKeyboard(visible:bool, animate:bool)

	###########################################################################
	# CONTENT ZOOM

	@define "contentScale",
		get: -> @_contentScale
		set: (contentScale) -> @setContentScale(contentScale, false)
	
	setContentScale: (contentScale, animate=false) ->
		
		contentScale = parseFloat(contentScale)
	
		if contentScale is @_contentScale
			return
		
		@_contentScale = contentScale
		
		if animate
			@content.animate _.extend @animationOptions,
				properties: {scale: @_contentScale}
		else
			@content.scale = @_contentScale

		@emit("change:contentScale")


	###########################################################################
