diff options
| author | Julie Lala <jules@okfoc.us> | 2014-08-28 20:43:48 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-08-28 20:43:48 -0400 |
| commit | 7998129546e67c0ffcbf63d5132de6333a44b912 (patch) | |
| tree | b1da33d0925cb24b0c3e250cc6326b2e939be6c7 /public/assets/javascripts/ui/builder | |
| parent | a3d40aa3718fce0754d7f78b19de9a00cac15395 (diff) | |
| parent | e35e2f338ee7b14d8396485e58cb5593060add8e (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/builder')
| -rw-r--r-- | public/assets/javascripts/ui/builder/BuilderSettings.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/builder/BuilderView.js | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js index 0091454..796c398 100644 --- a/public/assets/javascripts/ui/builder/BuilderSettings.js +++ b/public/assets/javascripts/ui/builder/BuilderSettings.js @@ -29,6 +29,8 @@ var BuilderSettings = FormView.extend({ this.$id.val(data._id) this.$name.val(data.name) + this.parent.lightControl.loadDefaults() + data.rooms && Rooms.deserialize(data.rooms) data.startPosition && scene.camera.move(data.startPosition) data.privacy && this.$privacy.find("[value=" + data.privacy + "]").prop('checked', "checked") diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js index 555cd58..a89111f 100644 --- a/public/assets/javascripts/ui/builder/BuilderView.js +++ b/public/assets/javascripts/ui/builder/BuilderView.js @@ -11,6 +11,7 @@ var BuilderView = View.extend({ this.info = new BuilderInfo ({ parent: this }) this.toolbar = new BuilderToolbar ({ parent: this }) this.settings = new BuilderSettings ({ parent: this }) + this.lightControl = new LightControl ({ parent: this }) }, load: function(name){ |