aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
diff options
context:
space:
mode:
authorJonathan Duran2012-03-01 20:01:36 -0800
committerJonathan Duran2012-03-01 20:01:36 -0800
commitb8fad971d8cf82cdc182160aa72d0c8e69800f76 (patch)
treee7791aacc4b4d59127600ad3e99bbb042b6506b0 /js/controllers/elements
parent28befbc159399f70f00034f52e56a60dae0a3ba1 (diff)
parentff0a956f33df034e9a009cfcb8999e469456a4b5 (diff)
downloadninja-b8fad971d8cf82cdc182160aa72d0c8e69800f76.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-xjs/controllers/elements/stage-controller.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index abad3736..34bb1fb5 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -104,9 +104,11 @@ exports.StageController = Montage.create(ElementController, {
104 el.elementModel.viewPort.style.setProperty(p, value); 104 el.elementModel.viewPort.style.setProperty(p, value);
105 break; 105 break;
106 case "width": 106 case "width":
107 this.application.ninja.currentDocument.iframe.width = parseInt(value) + 1400;
107 el.elementModel.stageDimension.style.setProperty(p, value); 108 el.elementModel.stageDimension.style.setProperty(p, value);
108 break; 109 break;
109 case "height": 110 case "height":
111 this.application.ninja.currentDocument.iframe.height = parseInt(value) + 400;
110 el.elementModel.stageDimension.style.setProperty(p, value); 112 el.elementModel.stageDimension.style.setProperty(p, value);
111 break; 113 break;
112 default: 114 default: