20 files changed, 146 insertions, 182 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 5c334b92..0be378fd 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -132,7 +132,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
              if (this._selectedBrushStroke === null){
                  this._selectedBrushStroke = new BrushStroke();
                  var colorArray=[0,0,0,0];
-                 var color = this.application.ninja.colorController.colorToolbar.fill.color;
+                 var color = this.options.fill.color;
                  if (color){
                      colorArray = [color.r/255, color.g/255, color.b/255, color.a];
                  } else {
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 87a093ff..66dd9305 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -72,9 +72,9 @@ exports.FillTool = Montage.create(ModifierToolBase, {
         value: function(event) {
             this.isDrawing = true;
 
-            if(this._canColor && this.application.ninja.selectedElements.length)
-            {
-                var color = this.application.ninja.colorController.colorToolbar.fill,
+            if(this._canColor && this.application.ninja.selectedElements.length) {
+
+                var color = this.options.fill,
                     colorInfo;
                 if(color && color.color)
                 {
@@ -92,5 +92,4 @@ exports.FillTool = Montage.create(ModifierToolBase, {
             }
         }
     }
-
 });
\ No newline at end of file
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index fd17f4d6..2c03d133 100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -69,7 +69,7 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, {
 
             if(this._canColor && this.application.ninja.selectedElements.length)
             {
-                var color = this.application.ninja.colorController.colorToolbar.stroke,
+                var color = this.options.stroke,
                     colorInfo;
                 if(color && color.color)
                 {
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 5941b464..b2b48383 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -44,8 +44,8 @@ exports.LineTool = Montage.create(ShapeTool, {
             }
 
             this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null);
-                        if (this.application.ninja.colorController.colorToolbar.stroke.color)
-                                this._strokeColor = this.application.ninja.colorController.colorToolbar.stroke.color.css;
+            if (this.options.stroke.color)
+                this._strokeColor = this.options.stroke.color.css;
                         else
                                 this._strokeColor = [0,0,0,1];
             this.startDraw(event);
@@ -215,7 +215,7 @@ exports.LineTool = Montage.create(ShapeTool, {
             var left = Math.round(midPt[0] - 0.5*w);
             var top = Math.round(midPt[1] - 0.5*h);
 
-            var strokeColor = this.application.ninja.colorController.colorToolbar.stroke.webGlColor;
+            var strokeColor = this.options.stroke.webGlColor;
             // for default stroke and fill/no materials
             var strokeMaterial = null;
 
@@ -234,7 +234,8 @@ exports.LineTool = Montage.create(ShapeTool, {
             var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
             var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2));
 
-            var line = new Line(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj);
+            var line = Object.create(Line, {});
+            line.init(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj);
 
             world.addObject(line);
             world.render();
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 6edec811..ce812398 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -39,8 +39,8 @@ exports.OvalTool = Montage.create(ShapeTool, {
 
             var innerRadius = this.options.innerRadius.value / 100;
 
-            var strokeColor = this.application.ninja.colorController.colorToolbar.stroke.webGlColor;
-            var fillColor = this.application.ninja.colorController.colorToolbar.fill.webGlColor;
+            var strokeColor = this.options.stroke.webGlColor;
+            var fillColor = this.options.fill.webGlColor;
 
             // for default stroke and fill/no materials
             var strokeMaterial = null;
@@ -68,7 +68,7 @@ exports.OvalTool = Montage.create(ShapeTool, {
             var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
             var yOffset = -(canvas.height/2 - (top - canvas.offsetTop + h/2));
 
-            var oval = new Circle(); //GLCircle();
+            var oval = Object.create(Circle, {});
             oval.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle);
 
             world.addObject(oval);
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index ce7606a1..39f89d17 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.model.documentRoot.scrollWidth - this.application.ninja.stage._canvas.width - 11;
+            this._maxVerticalScroll = this.application.ninja.currentDocument.model.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");
+//            }
        }
     },
 
@@ -109,7 +121,7 @@ exports.PanTool = Montage.create(toolBase,
         {
         value: function ()
                 {
-                        var uc = this.application.ninja.currentDocument.documentRoot;
+                        var uc = this.application.ninja.currentDocument.model.documentRoot;
                         //var uc = documentManagerModule.DocumentManager.activeDocument
                         var ucMat = viewUtils.getMatrixFromElement(uc);
 
@@ -136,12 +148,11 @@ 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;
            
-                        var uc = this.application.ninja.currentDocument.documentRoot;
+                        var uc = this.application.ninja.currentDocument.model.documentRoot;
                         var ucMat = viewUtils.getMatrixFromElement(uc);
                         var offset = viewUtils.getElementOffset( uc );
                         //console.log( "uc offset: " + offset[0] );
@@ -213,7 +224,7 @@ exports.PanTool = Montage.create(toolBase,
                                 if (elt)
                                 {
                                         // get the userContent object (stage) and its matrix
-                                        var userContent = this.application.ninja.currentDocument.documentRoot;
+                                        var userContent = this.application.ninja.currentDocument.model.documentRoot;
                                         var ucMat = viewUtils.getMatrixFromElement(userContent);
 
                                         var localToGlobalMat = viewUtils.getLocalToGlobalMatrix( elt );
@@ -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,
+