aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/ninja.reel/ninja.js2
-rwxr-xr-xjs/tools/RotateStage3DTool.js2
-rwxr-xr-xjs/tools/ZoomTool.js4
3 files changed, 5 insertions, 3 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index cf7c6cf4..edc1efa4 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -300,7 +300,7 @@ exports.Ninja = Montage.create(Component, {
300 // Turn on WebGL animation during preview 300 // Turn on WebGL animation during preview
301 _toggleWebGlAnimation: { 301 _toggleWebGlAnimation: {
302 value: function(inLivePreview) { 302 value: function(inLivePreview) {
303 var glCanvases = this.currentDocument.iframe.contentWindow.document.querySelectorAll('[data-RDGE-id]'), 303 var glCanvases = this.currentDocument.model.views.design.iframe.contentWindow.document.querySelectorAll('[data-RDGE-id]'),
304 glShapeModel; 304 glShapeModel;
305 if(glCanvases) { 305 if(glCanvases) {
306 for(var i = 0, len = glCanvases.length; i<len; i++) { 306 for(var i = 0, len = glCanvases.length; i<len; i++) {
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index 90cbe95e..c8818021 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -139,7 +139,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
139 // let the document and stage manager know about the zoom change 139 // let the document and stage manager know about the zoom change
140 this.application.ninja.stage._firstDraw = true; 140 this.application.ninja.stage._firstDraw = true;
141 this.application.ninja.documentBar.zoomFactor = 100; 141 this.application.ninja.documentBar.zoomFactor = 100;
142 this.application.ninja.currentDocument.iframe.style.zoom = 1.0; 142 this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0;
143 this.application.ninja.stage._firstDraw = false; 143 this.application.ninja.stage._firstDraw = false;
144 144
145 // TODO - Any updates to the stage should redraw stage's children. Move this to mediator? 145 // TODO - Any updates to the stage should redraw stage's children. Move this to mediator?
diff --git a/js/tools/ZoomTool.js b/js/tools/ZoomTool.js
index 93caf984..17301262 100755
--- a/js/tools/ZoomTool.js
+++ b/js/tools/ZoomTool.js
@@ -280,7 +280,9 @@ exports.ZoomTool = Montage.create(DrawingTool, {
280 this.application.ninja.documentBar.zoomFactor = zoomFactor*100; 280 this.application.ninja.documentBar.zoomFactor = zoomFactor*100;
281 //this.application.ninja.stage.zoomFactor = zoomFactor; 281 //this.application.ninja.stage.zoomFactor = zoomFactor;
282 if (zoomFactor >= 1) 282 if (zoomFactor >= 1)
283 this.application.ninja.currentDocument.iframe.style.zoom = zoomFactor; 283 {
284 this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = zoomFactor;
285 }
284 this.application.ninja.stage._firstDraw = false; 286 this.application.ninja.stage._firstDraw = false;
285 //tmp3 = viewUtils.localToGlobal( localPt, userContent ); // DEBUG - remove this line 287 //tmp3 = viewUtils.localToGlobal( localPt, userContent ); // DEBUG - remove this line
286 288