From 2cf19a478167a2bdba4f2c24a9b364e6c8d4f690 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Mon, 20 Jan 2014 22:37:47 -0800 Subject: [PATCH] Renamed canvases to spritesheets in the edit thang view. --- app/styles/editor/thang/edit.sass | 2 +- app/templates/editor/thang/edit.jade | 6 +++--- app/views/editor/thang/edit.coffee | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/styles/editor/thang/edit.sass b/app/styles/editor/thang/edit.sass index fd8050f8f..94dbe8de5 100644 --- a/app/styles/editor/thang/edit.sass +++ b/app/styles/editor/thang/edit.sass @@ -66,7 +66,7 @@ background-color: white border-radius: 4px -#canvases +#spritesheets border: 1px solid green max-width: 100% max-height: 600px diff --git a/app/templates/editor/thang/edit.jade b/app/templates/editor/thang/edit.jade index 9878c4e92..033d9da72 100644 --- a/app/templates/editor/thang/edit.jade +++ b/app/templates/editor/thang/edit.jade @@ -15,7 +15,7 @@ block content li a(href="#editor-thang-components-tab-view", data-toggle="tab") Components li - a(href="#editor-thang-canvases-view", data-toggle="tab") Canvases + a(href="#editor-thang-spritesheets-view", data-toggle="tab") Spritesheets li a(href="#editor-thang-colors-tab-view", data-toggle="tab")#color-tab Colors @@ -68,8 +68,8 @@ block content #thang-components-edit-view - div.tab-pane#editor-thang-canvases-view + div.tab-pane#editor-thang-spritesheets-view - div#canvases + div#spritesheets .clearfix diff --git a/app/views/editor/thang/edit.coffee b/app/views/editor/thang/edit.coffee index a218ca4af..dd4f1800b 100644 --- a/app/views/editor/thang/edit.coffee +++ b/app/views/editor/thang/edit.coffee @@ -188,10 +188,10 @@ module.exports = class ThangTypeEditView extends View options = @getSpriteOptions() @thangType.resetSpriteSheetCache() spriteSheet = @thangType.buildSpriteSheet(options) - $('#canvases').empty() + $('#spritesheets').empty() return unless spriteSheet for image in spriteSheet._images - $('#canvases').append(image) + $('#spritesheets').append(image) @showAnimation() @updatePortrait()