diff options
author | Eric Guzman | 2012-03-12 15:33:04 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-12 15:33:04 -0700 |
commit | 7e3161153b87b891875ac65368a19aed12909fa3 (patch) | |
tree | b80f48d711a9729fc39dbbdff28c4f0620e7302d /js/controllers/elements/stage-controller.js | |
parent | 7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff) | |
parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
download | ninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/controllers/elements/stage-controller.js')
-rwxr-xr-x | js/controllers/elements/stage-controller.js | 2 |
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: |