aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-21 13:26:55 -0700
committerJose Antonio Marquez2012-03-21 13:26:55 -0700
commit25c93afe8795c1b53859f4fa08220a947ace937e (patch)
treebf7ba60aa1e31cf479ec4a53f9f3e510cfd9a4dd /js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js
parentdf25e7bb3dd45cec5815dcd303a94726e982cabf (diff)
parentbabe504e1cdfd98a5df8fd325d54aab72ca3cdb0 (diff)
downloadninja-25c93afe8795c1b53859f4fa08220a947ace937e.tar.gz
Merge branch 'refs/heads/montage-integration' into FileIO-Montage-Components
Diffstat (limited to 'js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js')
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js
index 49117090..1e47916f 100755
--- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js
+++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js
@@ -100,7 +100,7 @@ exports.PosSize = Montage.create(Component, {
100 */ 100 */
101 handleRatioAction: { 101 handleRatioAction: {
102 value: function() { 102 value: function() {
103 if(this.bindButton.value) { 103 if(this.bindButton.pressed) {
104 this.aspectRatioWidth = this.heightControl.value / this.widthControl.value; 104 this.aspectRatioWidth = this.heightControl.value / this.widthControl.value;
105 if(isNaN(this.aspectRatioWidth) || !isFinite(this.aspectRatioWidth) || this.aspectRatioWidth === 0) this.aspectRatioWidth = 1; 105 if(isNaN(this.aspectRatioWidth) || !isFinite(this.aspectRatioWidth) || this.aspectRatioWidth === 0) this.aspectRatioWidth = 1;
106 106
@@ -148,7 +148,7 @@ exports.PosSize = Montage.create(Component, {
148 148
149 this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; 149 this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot];
150 150
151 if(this.bindButton.value) { 151 if(this.bindButton.pressed) {
152 152
153 var newWidth = Math.round(this.aspectRatioHeight * this.heightControl.value); 153 var newWidth = Math.round(this.aspectRatioHeight * this.heightControl.value);
154 154
@@ -173,7 +173,7 @@ exports.PosSize = Montage.create(Component, {
173 173
174 this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; 174 this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot];
175 175
176 if(this.bindButton.value) { 176 if(this.bindButton.pressed) {
177 177
178 var newHeight = Math.round(this.aspectRatioWidth * this.widthControl.value); 178 var newHeight = Math.round(this.aspectRatioWidth * this.widthControl.value);
179 179
@@ -221,7 +221,7 @@ exports.PosSize = Montage.create(Component, {
221 221
222 this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; 222 this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot];
223 223
224 if(this.bindButton.value) { 224 if(this.bindButton.pressed) {
225 225
226 var newWidth = Math.round(this.aspectRatioHeight * this.heightControl.value); 226 var newWidth = Math.round(this.aspectRatioHeight * this.heightControl.value);
227 227
@@ -246,7 +246,7 @@ exports.PosSize = Montage.create(Component, {
246 246
247 this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot]; 247 this.application.ninja.selectedElements.length ? items = this.application.ninja.selectedElements : items = [this.application.ninja.currentDocument.documentRoot];
248 248
249 if(this.bindButton.value) { 249 if(this.bindButton.pressed) {
250 var newHeight = Math.round(this.aspectRatioWidth * this.widthControl.value); 250 var newHeight = Math.round(this.aspectRatioWidth * this.widthControl.value);
251 251
252 if(!isFinite(newHeight)) newHeight = this.widthControl.value; 252 if(!isFinite(newHeight)) newHeight = this.widthControl.value;