From 0f29e098cc7847c4362241e26a90808d9be8f9c1 Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Tue, 25 Nov 2014 13:28:15 -0800
Subject: [PATCH] ThangTypes with empty portraits now upload them with blank
images, to overwrite extant portraits.
---
app/models/ThangType.coffee | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee
index 1191eb16a..7bd2ef147 100644
--- a/app/models/ThangType.coffee
+++ b/app/models/ThangType.coffee
@@ -232,7 +232,9 @@ module.exports = class ThangType extends CocoModel
stage?.toDataURL()
getPortraitStage: (spriteOptionsOrKey, size=100) ->
- return unless @isFullyLoaded()
+ canvas = $("<canvas width='#{size}' height='#{size}'></canvas>")
+ stage = new createjs.Stage(canvas[0])
+ return stage unless @isFullyLoaded()
key = spriteOptionsOrKey
key = if _.isString(key) then key else @spriteSheetKey(@fillOptions(key))
spriteSheet = @spriteSheets[key]
@@ -242,8 +244,6 @@ module.exports = class ThangType extends CocoModel
spriteSheet = @buildSpriteSheet(options)
return if _.isString spriteSheet
return unless spriteSheet
- canvas = $("<canvas width='#{size}' height='#{size}'></canvas>")
- stage = new createjs.Stage(canvas[0])
sprite = new createjs.Sprite(spriteSheet)
pt = @actions.portrait?.positions?.registration
sprite.regX = pt?.x or 0