From 434a0c071bcd7d1823b88a38b56e0210939f5e90 Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Fri, 29 Aug 2014 12:29:42 -0700
Subject: [PATCH] Few more bugs fixed for defaults.
---
app/views/editor/level/systems/AddLevelSystemModal.coffee | 2 --
app/views/editor/level/systems/SystemsTabView.coffee | 8 ++++----
app/views/editor/level/thangs/ThangsTabView.coffee | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/app/views/editor/level/systems/AddLevelSystemModal.coffee b/app/views/editor/level/systems/AddLevelSystemModal.coffee
index 20a00e886..84a0c0abf 100644
--- a/app/views/editor/level/systems/AddLevelSystemModal.coffee
+++ b/app/views/editor/level/systems/AddLevelSystemModal.coffee
@@ -48,8 +48,6 @@ module.exports = class AddLevelSystemModal extends ModalView
levelSystem =
original: s.get('original') ? id
majorVersion: s.get('version').major ? 0
- # TODO DEFAULTS
- config: $.extend(true, {}, s.get('configSchema').default ? {})
@extantSystems.push levelSystem
Backbone.Mediator.publish 'level-system-added', system: levelSystem
@renderAvailableSystems()
diff --git a/app/views/editor/level/systems/SystemsTabView.coffee b/app/views/editor/level/systems/SystemsTabView.coffee
index e45884c4a..29179e06a 100644
--- a/app/views/editor/level/systems/SystemsTabView.coffee
+++ b/app/views/editor/level/systems/SystemsTabView.coffee
@@ -81,9 +81,9 @@ module.exports = class SystemsTabView extends CocoView
@removeSubView @levelSystemEditView if @levelSystemEditView
@levelSystemEditView = null
return
- until selected.data.original
+ until (data = selected.getData()) and data.original
selected = selected.parent
- @editLevelSystem original: selected.data.original, majorVersion: selected.data.majorVersion
+ @editLevelSystem original: data.original, majorVersion: data.majorVersion
onLevelSystemAdded: (e) ->
@systemsTreema.insert '/', e.system
@@ -106,13 +106,13 @@ module.exports = class SystemsTabView extends CocoView
buildDefaultSystems: ->
[
{original: '528112c00268d018e3000008', majorVersion: 0} # Event
- {original: '5280f83b8ae1581b66000001', majorVersion: 0, config: {lifespan: 60}} # Existence
+ {original: '5280f83b8ae1581b66000001', majorVersion: 0} # Existence
{original: '5281146f0268d018e3000014', majorVersion: 0} # Programming
{original: '528110f30268d018e3000001', majorVersion: 0} # AI
{original: '52810ffa33e01a6e86000012', majorVersion: 0} # Action
{original: '528114b20268d018e3000017', majorVersion: 0} # Targeting
{original: '528105f833e01a6e86000007', majorVersion: 0} # Collision
- {original: '528113240268d018e300000c', majorVersion: 0, config: {gravity: 9.81}} # Movement
+ {original: '528113240268d018e300000c', majorVersion: 0} # Movement
{original: '528112530268d018e3000007', majorVersion: 0} # Combat
{original: '52810f4933e01a6e8600000c', majorVersion: 0} # Hearing
{original: '528115040268d018e300001b', majorVersion: 0} # Vision
diff --git a/app/views/editor/level/thangs/ThangsTabView.coffee b/app/views/editor/level/thangs/ThangsTabView.coffee
index f00f52259..c3faaddfd 100644
--- a/app/views/editor/level/thangs/ThangsTabView.coffee
+++ b/app/views/editor/level/thangs/ThangsTabView.coffee
@@ -161,7 +161,7 @@ module.exports = class ThangsTabView extends CocoView
thangsHeaderHeight = $('#thangs-header').height()
oldHeight = $('#thangs-list').height()
$('#thangs-list').height(oldHeight - thangsHeaderHeight)
- if data.thangs.length
+ if data.thangs?.length
@$el.find('#randomize-button').hide()
initSurface: ->