Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	js/components/layout/tools-properties.reel/tools-properties.html

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 3 insertions, 1 deletions

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, {
                         this.application.ninja.documentBar.zoomFactor = zoomFactor*100;
             //this.application.ninja.stage.zoomFactor = zoomFactor;
                         if (zoomFactor >= 1)
-                                this.application.ninja.currentDocument.iframe.style.zoom = zoomFactor;
+            {
+                this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = zoomFactor;
+            }
                         this.application.ninja.stage._firstDraw = false;
                         //tmp3 = viewUtils.localToGlobal( localPt,  userContent );      // DEBUG - remove this line