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

Merge pull request #1417 from jayant1992/master

Browse source 
Level editor fixes
This commit is contained in:
Nick Winter 2014-08-08 08:30:53 -07:00
commit 523fd3e4ca
5 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/styles/editor/components/main.sass
View file

@ -41,8 +41,10 @@
bottom: 0 bottom: 0
overflow: scroll overflow: scroll
.treema-row .add-button .treema-row
margin-left: 10px line-height: 24px
.add-button
margin-left: 10px
#component-config-column-view #component-config-column-view
border-left: 1px solid black border-left: 1px solid black

16
app/styles/editor/level/thangs_tab.sass
View file

@ -216,20 +216,12 @@ $mobile: 1050px
#canvas-wrapper #canvas-wrapper
width: 100% width: 100%
position: relative position: relative
text-align: center
#canvas-overlay #randomize-button
display: none
position: absolute position: absolute
width: 100% top: 45%
height: 100% height: 40px
background: white
opacity: 0.5
text-align: center
#randomize-button
position: absolute
top: 45%
height: 40px

3
app/templates/editor/level/thangs_tab.jade
View file

@ -25,8 +25,7 @@ button.navbar-toggle.toggle.btn-primary#thangs-palette-toggle(type="button", dat
.world-container.thangs-column .world-container.thangs-column
h3(data-i18n="editor.level_tab_thangs_conditions") Starting Conditions h3(data-i18n="editor.level_tab_thangs_conditions") Starting Conditions
#canvas-wrapper #canvas-wrapper
#canvas-overlay button.btn.btn-primary(id="randomize-button", data-toggle="coco-modal", data-target="editor/level/modals/TerrainRandomizeModal", data-i18n="editor.randomize", title="Randomize Terrain") Randomize
button.btn.btn-primary(id="randomize-button", data-toggle="coco-modal", data-target="editor/level/modals/TerrainRandomizeModal", data-i18n="editor.randomize", title="Randomize Terrain") Randomize
ul.dropdown-menu#contextmenu ul.dropdown-menu#contextmenu
li#delete li#delete
a(data-i18n="editor.delete") Delete a(data-i18n="editor.delete") Delete

11
app/views/editor/component/ThangComponentEditView.coffee
View file

@ -76,7 +76,9 @@ module.exports = class ThangComponentEditView extends CocoView
@addComponentsTreema = @$el.find('#add-component-column .treema').treema treemaOptions @addComponentsTreema = @$el.find('#add-component-column .treema').treema treemaOptions
@addComponentsTreema.build() @addComponentsTreema.build()
@$el.find('#add-component-column .treema-node').draggable({ @$el.find('#add-component-column .treema-node').draggable({
revert: true revert: 'invalid'
helper: 'clone'
appendTo: 'body'
start: (e) -> start: (e) ->
# Hack to ensure dragged treema node is selected # Hack to ensure dragged treema node is selected
$(@).trigger('click') unless $(@).hasClass 'treema-selected' $(@).trigger('click') unless $(@).hasClass 'treema-selected'
@ -191,8 +193,9 @@ module.exports = class ThangComponentEditView extends CocoView
# reselect newly added child treema in the extantComponentsTreema # reselect newly added child treema in the extantComponentsTreema
for index, treema of @extantComponentsTreema.childrenTreemas for index, treema of @extantComponentsTreema.childrenTreemas
if treema.component.id is id if treema.component.id is id
treema.select() _.defer =>
@onSelectExtantComponent({}, [treema]) treema.select()
@onSelectExtantComponent({}, [treema])
return return
onAddComponentDoubleClicked: (e, treema) => onAddComponentDoubleClicked: (e, treema) =>
@ -260,7 +263,7 @@ class ComponentArrayNode extends TreemaArrayNode
class ComponentNode extends TreemaObjectNode class ComponentNode extends TreemaObjectNode
valueClass: 'treema-component' valueClass: 'treema-component'
addButtonTemplate: '<button type="button" class="add-button btn btn-default btn-sm"><span class="glyphicon glyphicon-plus"></span></button>' addButtonTemplate: '<button type="button" class="add-button btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></button>'
collection: false collection: false
build: -> build: ->

4
app/views/editor/level/thangs/ThangsTabView.coffee
View file

@ -157,6 +157,8 @@ module.exports = class ThangsTabView extends CocoView
thangsHeaderHeight = $('#thangs-header').height() thangsHeaderHeight = $('#thangs-header').height()
oldHeight = $('#thangs-list').height() oldHeight = $('#thangs-list').height()
$('#thangs-list').height(oldHeight - thangsHeaderHeight) $('#thangs-list').height(oldHeight - thangsHeaderHeight)
if data.thangs.length
@$el.find('#randomize-button').hide()
initSurface: -> initSurface: ->
surfaceCanvas = $('canvas#surface', @$el) surfaceCanvas = $('canvas#surface', @$el)
@ -235,7 +237,6 @@ module.exports = class ThangsTabView extends CocoView
@addThang @addThangType, thang.pos, true @addThang @addThangType, thang.pos, true
@batchInsert() @batchInsert()
@selectAddThangType null @selectAddThangType null
@$el.find('#canvas-overlay').css('display', 'none')
# TODO: figure out a good way to have all Surface clicks and Treema clicks just proxy in one direction, so we can maintain only one way of handling selection and deletion # TODO: figure out a good way to have all Surface clicks and Treema clicks just proxy in one direction, so we can maintain only one way of handling selection and deletion
@ -410,6 +411,7 @@ module.exports = class ThangsTabView extends CocoView
@thangsBatch = [] @thangsBatch = []
addThang: (thangType, pos, batchInsert=false) -> addThang: (thangType, pos, batchInsert=false) ->
@$el.find('#randomize-button').hide()
if batchInsert if batchInsert
thangID = "Random #{thangType.get('name')} #{@thangsBatch.length}" thangID = "Random #{thangType.get('name')} #{@thangsBatch.length}"
else else