5 files changed, 55 insertions, 41 deletions

diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index ce7606a1..5cfeec75 100755
--- a/js/tools/PanTool.js
+++ b/js/tools/PanTool.js
@@ -21,6 +21,9 @@ exports.PanTool = Montage.create(toolBase,
         _lastGPt :{value: [0,0], writable:true},
         _lastY :{value: 0, writable:true},
 
+        _maxHorizontalScroll: {value: 0, writable:true},
+        _maxVerticalScroll: {value: 0, writable:true},
+
     Configure: {
         value: function ( doActivate )
                 {
@@ -43,10 +46,19 @@ exports.PanTool = Montage.create(toolBase,
 
     HandleLeftButtonDown: {
         value : function ( event ) {
-            this._isDrawing = true;
-                        this.isDrawing = true;
- 
-                                this.mouseDown( event );
+            // Determine the maximum horizontal and vertical scroll values
+            this._maxHorizontalScroll = this.application.ninja.currentDocument.documentRoot.scrollWidth - this.application.ninja.stage._canvas.width - 11;
+            this._maxVerticalScroll = this.application.ninja.currentDocument.documentRoot.scrollHeight - this.application.ninja.stage._canvas.height - 11;
+            if((this._maxHorizontalScroll > 0) || (this._maxVerticalScroll > 0) || this._altKeyDown)
+            {
+                this._isDrawing = true;
+                this.isDrawing = true;
+                this.mouseDown( event );
+            }
+//            else
+//            {
+//                console.log("nothing to scroll");
+//            }
        }
     },
 
@@ -136,8 +148,7 @@ exports.PanTool = Montage.create(toolBase,
                                 delta = 10*event.wheelDelta/120;
                         //console.log( "delta: " + delta );
 
-            this.application.ninja.stage._iframeContainer.scrollLeft += delta;
-            this.application.ninja.stage._scrollLeft += delta;
+            this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft += delta;
 
                         delta *= zoom;
            
@@ -291,17 +302,19 @@ exports.PanTool = Montage.create(toolBase,
                         if (this._isDrawing)
                         {
                                 // get the global screen point
-                                var gPt = [point.x, point.y, this._globalPt[2]];
+                                var gPt = [point.x, point.y, this._globalPt[2]],
+                    dx,
+                    dy;
                                 if (this._altKeyDown)
                                 {
-                                        var dy = 5*(point.y - this._lastY);
+                                        dy = 5*(point.y - this._lastY);
                                         this._globalPt[2] += dy;
                                         gPt = [this._lastGPt[0], this._lastGPt[1], this._globalPt[2]];
                                 }
                                 else if (this._shiftKeyDown)
                                 {
-                                        var dx = Math.abs( this._shiftPt[0] - gPt[0] ),
-                                                dy = Math.abs( this._shiftPt[1] - gPt[1] );
+                                        dx = Math.abs( this._shiftPt[0] - gPt[0] );
+                                        dy = Math.abs( this._shiftPt[1] - gPt[1] );
 
                                         if (dx >= dy)
                                                 gPt[1] = this._shiftPt[1];
@@ -310,16 +323,28 @@ exports.PanTool = Montage.create(toolBase,
                                 }
 
                                 // update the scrollbars
-                                var deltaGPt = VecUtils.vecSubtract(2, gPt, this._lastGPt);
+                                var deltaGPt = vecUtils.vecSubtract(2, gPt, this._lastGPt);
                                 this._lastGPt = gPt.slice();
                                 this._lastY = point.y;
-
-                                var oldLeft = this.application.ninja.stage._iframeContainer.scrollLeft,
-                                        oldTop  = this.application.ninja.stage._iframeContainer.scrollTop;
-                                this.application.ninja.stage._iframeContainer.scrollLeft -= deltaGPt[0];
-                                this.application.ninja.stage._iframeContainer.scrollTop  -= deltaGPt[1];
-                                deltaGPt[0] = oldLeft - this.application.ninja.stage._iframeContainer.scrollLeft;
-                                deltaGPt[1] = oldTop  - this.application.ninja.stage._iframeContainer.scrollTop;
+                var limitX = false;
+                var limitY = false;
+
+                                var oldLeft = this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft,
+                                        oldTop  = this.application.ninja.currentDocument.model.views.design.document.body.scrollTop,
+                    newLeft = oldLeft - deltaGPt[0],
+                    newTop = oldTop - deltaGPt[1];
+                if((newLeft < 0) || (newLeft > this._maxHorizontalScroll))
+                {
+                    limitX = true;
+                }
+                if((newTop < 0) || (newTop > this._maxVerticalScroll))
+                {
+                    limitY = true;
+                }
+                this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft -= deltaGPt[0];
+                this.application.ninja.currentDocument.model.views.design.document.body.scrollTop  -= deltaGPt[1];
+                                deltaGPt[0] = oldLeft - this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft;
+                                deltaGPt[1] = oldTop  - this.application.ninja.currentDocument.model.views.design.document.body.scrollTop;
 
                                 gPt[0] -= deltaGPt[0];
                                 gPt[1] -= deltaGPt[1];
@@ -334,7 +359,7 @@ exports.PanTool = Montage.create(toolBase,
 
                                 // limit the change
                                 var ucMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.documentRoot);
-                                var tooMuch = false
+                                var tooMuch = false;
                                 if ((ucMat[12] >  12000) && (delta[0] > 0))  tooMuch = true;
                                 if ((ucMat[12] < -12000) && (delta[0] < 0))  tooMuch = true;
                                 if ((ucMat[13] >  12000) && (delta[1] > 0))  tooMuch = true;
@@ -349,6 +374,8 @@ exports.PanTool = Montage.create(toolBase,
                                 else
                                         this._worldPt = wPt;
 
+                if(limitX) delta[0] = 0;
+                if(limitY) delta[1] = 0;
                                 // update everything
                                 var transMat = Matrix.Translation( delta );
                                 this.applyDeltaMat( transMat );
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index 2a9c63db..c8818021 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -96,12 +96,6 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
             viewUtils.pushViewportObj( stage );
             var eltCtr = viewUtils.getCenterOfProjection();
             viewUtils.popViewportObj();
-//            if(this.application.ninja.documentController.webTemplate)
-            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent")
-            {
-                eltCtr[0] = stage.scrollWidth/2;
-                eltCtr[1] = stage.scrollHeight/2;
-            }
 
             var curMat = viewUtils.getMatrixFromElement(stage);
             var curMatInv = glmat4.inverse(curMat, []);
@@ -118,17 +112,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
             }
 
             this._origin = viewUtils.localToGlobal(eltCtr, stage);
-
-//            if(this.application.ninja.documentController.webTemplate)
-            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent")
-            {
-                this._startOriginArray = [];
-                this._startOriginArray.push(this._origin.slice());
-            }
-            else
-            {
-                this._setTransformOrigin(false);
-            }
+            this._setTransformOrigin(false);
             this.DrawHandles();
         }
     },
@@ -155,7 +139,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
                         // let the document and stage manager know about the zoom change
                         this.application.ninja.stage._firstDraw = true;
                         this.application.ninja.documentBar.zoomFactor = 100;
-                        this.application.ninja.currentDocument.iframe.style.zoom = 1.0;
+            this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0;
                         this.application.ninja.stage._firstDraw = false;
 
            // TODO - Any updates to the stage should redraw stage's children. Move this to mediator?
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 07c26b8c..5c8b15ae 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -165,10 +165,11 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                                         box[3] = point.y;
 
                     //selectionManagerModule.selectionManager.marqueeSelection(box);
-                    var childNodes = this.application.ninja.currentDocument.documentRoot.childNodes;
+                    var childNodes = this.application.ninja.currentDocument.documentRoot.childNodes,
+                        selectionController = this.application.ninja.selectionController;
                     childNodes = Array.prototype.slice.call(childNodes, 0);
                     childNodes.forEach(function(item) {
-                        if(item.nodeType == 1 && SelectionTool._complicatedCollisionDetection(item, box)) {
+                        if(selectionController.isNodeTraversable(item) && SelectionTool._complicatedCollisionDetection(item, box)) {
                             selectedItems.push(item);
                         }
                     });
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 0562dbc2..367ab78d 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -72,7 +72,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                     if(!canvas.elementModel.shapeModel) {
                         canvas.elementModel.shapeModel = Montage.create(ShapeModel);
                     }
-                                        this.application.ninja.elementMediator.addElements(canvas, canvas.elementModel.data);
+                    this.RenderShape(drawData.width, drawData.