Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/properties.reel/properties.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/js/tools/ZoomTool.js b/js/tools/ZoomTool.js
index 93caf984..dc096592 100755
--- a/js/tools/ZoomTool.js
+++ b/js/tools/ZoomTool.js
@@ -184,7 +184,7 @@ exports.ZoomTool = Montage.create(DrawingTool, {
     _setZoom:{
         value:function(mode,zoomFactor)
                 {
-            var userContent = this.application.ninja.currentDocument.documentRoot;
+            var userContent = this.application.ninja.currentDocument.model.documentRoot;
             this._oldValue = this.application.ninja.documentBar.zoomFactor;
 
                         var globalPt;
@@ -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