aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/position-size.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-25 11:22:58 -0700
committerArmen Kesablyan2012-05-25 11:22:58 -0700
commit81239571c538f72e398fafa5b07725bf1bbb2d5d (patch)
treed31c876f5af61565eff8c934c9e5f119696d46e0 /js/panels/properties.reel/sections/position-size.reel
parente8c4e98c24092a360eb2f637983fd104fbb67f66 (diff)
parent9c8d724dd1605ee2e5257591e0bfaad575cbc906 (diff)
downloadninja-81239571c538f72e398fafa5b07725bf1bbb2d5d.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Diffstat (limited to 'js/panels/properties.reel/sections/position-size.reel')
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.js8
1 files changed, 4 insertions, 4 deletions
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);