diff options
Diffstat (limited to 'js/panels/properties.reel/sections')
3 files changed, 7 insertions, 7 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 49b4414e..ae408f11 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
@@ -116,7 +116,7 @@ exports.CustomSection = Montage.create(Component, { | |||
116 | value: function(event) { | 116 | value: function(event) { |
117 | // Change the stage color for now | 117 | // Change the stage color for now |
118 | //console.log(this, event); | 118 | //console.log(this, event); |
119 | ElementsMediator.setProperty([this.application.ninja.currentDocument.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); | 119 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); |
120 | /* | 120 | /* |
121 | var propEvent = document.createEvent("CustomEvent"); | 121 | var propEvent = document.createEvent("CustomEvent"); |
122 | propEvent.initEvent("propertyChange", true, true); | 122 | propEvent.initEvent("propertyChange", true, true); |
@@ -400,7 +400,7 @@ exports.CustomSection = Montage.create(Component, { | |||
400 | this.controls[aField.id] = obj; | 400 | this.controls[aField.id] = obj; |
401 | 401 | ||
402 | // TODO - Hack for now to reference the color select object to unregister color chips | 402 | // TODO - Hack for now to reference the color select object to unregister color chips |
403 | this.controls["stageBackground"] = obj; | 403 | this.controls["background"] = obj; |
404 | 404 | ||
405 | return obj; | 405 | return obj; |
406 | } | 406 | } |
diff --git a/js/panels/properties.reel/sections/position-size.reel/position-size.js b/js/panels/properties.reel/sections/position-size.reel/position-size.js index 10e084be..7c24e02a 100755 --- a/js/panels/properties.reel/sections/position-size.reel/position-size.js +++ b/js/panels/properties.reel/sections/position-size.reel/position-size.js | |||
@@ -158,7 +158,7 @@ exports.PositionSize = Montage.create(Component, { | |||
158 | if(!event.wasSetByCode) { | 158 | if(!event.wasSetByCode) { |
159 | if(this.savedPosition) prevPosition = [this.savedPosition + "px"]; | 159 | if(this.savedPosition) prevPosition = [this.savedPosition + "px"]; |
160 | 160 | ||
161 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; | 161 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.model.documentRoot]; |
162 | 162 | ||
163 | if(this.bindButton.pressed) { | 163 | if(this.bindButton.pressed) { |
164 | 164 | ||
@@ -183,7 +183,7 @@ exports.PositionSize = Montage.create(Component, { | |||
183 | if(!event.wasSetByCode) { | 183 | if(!event.wasSetByCode) { |
184 | if(this.savedPosition) prevPosition = [this.savedPosition + "px"]; | 184 | if(this.savedPosition) prevPosition = [this.savedPosition + "px"]; |
185 | 185 | ||
186 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; | 186 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.model.documentRoot]; |
187 | 187 | ||
188 | if(this.bindButton.pressed) { | 188 | if(this.bindButton.pressed) { |
189 | 189 | ||
@@ -231,7 +231,7 @@ exports.PositionSize = Montage.create(Component, { | |||
231 | 231 | ||
232 | if(!this.savedPosition) this.savedPosition = this.heightSize; | 232 | if(!this.savedPosition) this.savedPosition = this.heightSize; |
233 | 233 | ||
234 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; | 234 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.model.documentRoot]; |
235 | 235 | ||
236 | if(this.bindButton.pressed) { | 236 | if(this.bindButton.pressed) { |
237 | 237 | ||
@@ -256,7 +256,7 @@ exports.PositionSize = Montage.create(Component, { | |||
256 | 256 | ||
257 | if(!this.savedPosition) this.savedPosition = this.widthSize; | 257 | if(!this.savedPosition) this.savedPosition = this.widthSize; |
258 | 258 | ||
259 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; | 259 | this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.model.documentRoot]; |
260 | 260 | ||
261 | if(this.bindButton.pressed) { | 261 | if(this.bindButton.pressed) { |
262 | var newHeight = Math.round(this.aspectRatioWidth * this.widthControl.value); | 262 | var newHeight = Math.round(this.aspectRatioWidth * this.widthControl.value); |
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js index dcba51a4..e16e3509 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | |||
@@ -247,7 +247,7 @@ exports.ThreeD = Montage.create(Component, { | |||
247 | if(els.length) { | 247 | if(els.length) { |
248 | return els[0]; | 248 | return els[0]; |
249 | } else { | 249 | } else { |
250 | return this.boundObject.application.ninja.currentDocument.documentRoot; | 250 | return this.boundObject.application.ninja.currentDocument.model.documentRoot; |
251 | } | 251 | } |
252 | } | 252 | } |
253 | }, | 253 | }, |