codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
George Saines 2014-09-01 16:28:03 -07:00
commit 5f9cc2561a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/views/editor/thang/ThangTypeColorsTabView.coffee
View file

@ -67,11 +67,12 @@ module.exports = class ThangTypeColorsTabView extends CocoView
@spriteBuilder.setOptions options @spriteBuilder.setOptions options
@spriteBuilder.buildColorMaps() @spriteBuilder.buildColorMaps()
@movieClip = @spriteBuilder.buildMovieClip animation @movieClip = @spriteBuilder.buildMovieClip animation
larger = Math.min(400 / @movieClip.nominalBounds.width, 400 / @movieClip.nominalBounds.height) bounds = @movieClip.frameBounds?[0] ? @movieClip.nominalBounds
larger = Math.min(400 / bounds.width, 400 / bounds.height)
@movieClip.scaleX = larger @movieClip.scaleX = larger
@movieClip.scaleY = larger @movieClip.scaleY = larger
@movieClip.regX = @movieClip.nominalBounds.x @movieClip.regX = bounds.x
@movieClip.regY = @movieClip.nominalBounds.y @movieClip.regY = bounds.y
@stage.addChild @movieClip @stage.addChild @movieClip
updateContainer: -> updateContainer: ->