diff options
author | Jose Antonio Marquez | 2012-03-01 18:13:18 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-01 18:13:18 -0800 |
commit | 66bc1f46938afc696b11878ebbb97d1fd361386e (patch) | |
tree | a4e8d066bf80a43f42ce971a3ca05ab88f457d16 /js/controllers/elements | |
parent | 80ac930684255dd24cecae70b488285a6058488e (diff) | |
parent | 61dd921d5bb06ab47ee84506dbaaeaf4895ebf42 (diff) | |
download | ninja-66bc1f46938afc696b11878ebbb97d1fd361386e.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/controllers/elements')
-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: |