diff options
| author | Julie Lala <jules@okfoc.us> | 2014-10-16 00:58:28 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-10-16 00:58:28 -0400 |
| commit | 513a272520222784d67dc22c1ac833aa47a9c844 (patch) | |
| tree | cf1ac316a4f4e29aea13af30e5e0764e8f243d6c /public/assets/javascripts/ui/builder | |
| parent | a7fe78b6059e3568d38876ba68e650b841912125 (diff) | |
rename light control to color control
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 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js index fe67e9b..c8c8880 100644 --- a/public/assets/javascripts/ui/builder/BuilderSettings.js +++ b/public/assets/javascripts/ui/builder/BuilderSettings.js @@ -30,7 +30,7 @@ var BuilderSettings = FormView.extend({ this.$id.val(data._id) this.$name.val(data.name) - this.parent.lightControl.loadDefaults() + this.parent.colorControl.loadDefaults() data.rooms && Rooms.deserialize(data.rooms) data.startPosition && scene.camera.move(data.startPosition) diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js index a89111f..735274e 100644 --- a/public/assets/javascripts/ui/builder/BuilderView.js +++ b/public/assets/javascripts/ui/builder/BuilderView.js @@ -11,7 +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 }) + this.colorControl = new ColorControl ({ parent: this }) }, load: function(name){ |