Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

9 files changed, 62 insertions, 54 deletions

diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 477966da..fabcec69 100644
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -54,10 +54,24 @@ exports.FillTool = Montage.create(ModifierToolBase, {
         value: function(event) {
             this.isDrawing = true;
 
-            if(this._canColor)
+            if(this._canColor && this.application.ninja.selectedElements.length)
             {
-                var color = this.application.ninja.colorController.colorToolbar.fill;
-                ElementsMediator.setColor(this.application.ninja.selectedElements, color, true, "Change", "fillTool");
+                var color = this.application.ninja.colorController.colorToolbar.fill,
+                    colorInfo;
+                if(color && color.color)
+                {
+                    colorInfo = { mode:color.colorMode,
+                                       color:color.color
+                                    };
+                    ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
+                }
+                else
+                {
+                    colorInfo = { mode:"nocolor",
+                                       color:color.color
+                                    };
+                    ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
+                }
             }
         }
     }
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 042ba0b2..17157f23 100644
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -99,6 +99,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                 }
                 this.RenderShape(w, h, drawData.planeMat, drawData.midPt,
                                     canvas, slope, xAdj, yAdj);
+                NJevent("elementAdded", canvas);
             }
 
             this.endDraw(event);
@@ -225,6 +226,10 @@ exports.LineTool = Montage.create(ShapeTool, {
                 canvas.elementModel.pi = "LinePi";
                 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
                 canvas.elementModel.shapeModel.stroke = strokeColor;
+                if(strokeColor)
+                {
+                    canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+                }
 
                 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
                 canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex;
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index e0f1f03f..2fa5411b 100644
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -75,6 +75,14 @@ exports.OvalTool = Montage.create(ShapeTool, {
                 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
                 canvas.elementModel.shapeModel.stroke = strokeColor;
                 canvas.elementModel.shapeModel.fill = fillColor;
+                if(strokeColor)
+                {
+                    canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+                }
+                if(fillColor)
+                {
+                    canvas.elementModel.shapeModel.background = this.application.ninja.colorController.colorToolbar.fill;
+                }
 
                 canvas.elementModel.shapeModel.innerRadius = this.options.innerRadius.value  + " " + this.options.innerRadius.units;
 
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index ba40b020..71301d46 100644
--- a/js/tools/PanTool.js
+++ b/js/tools/PanTool.js
@@ -19,6 +19,7 @@ exports.PanTool = Montage.create(toolBase,
         _globalPt :{value: [0,0] , writable:true},
         _globalToUCWorld :{value: [] , writable:true},
         _lastGPt :{value: [0,0], writable:true},
+        _lastY :{value: 0, writable:true},
 
     Configure: {
         value: function ( doActivate )
@@ -43,6 +44,7 @@ exports.PanTool = Montage.create(toolBase,
     HandleLeftButtonDown: {
         value : function ( event ) {
             this._isDrawing = true;
+                        this.isDrawing = true;
  
                                 this.mouseDown( event );
        }
@@ -68,6 +70,7 @@ exports.PanTool = Montage.create(toolBase,
                             this.application.ninja.stage.clearDrawingCanvas();
                 this._hasDraw = false;
                 this._isDrawing = false;
+                this.isDrawing = false;
             }
         }
     },
@@ -77,7 +80,6 @@ exports.PanTool = Montage.create(toolBase,
             if(event.altKey)
                         {
                 this._altKeyDown = true;
-                                //console.log( "altKeyDown" );
             }
         }
     },
@@ -87,7 +89,6 @@ exports.PanTool = Montage.create(toolBase,
             if(event.keyCode === Keyboard.ALT)
                         {
                 this._altKeyDown = false;
-                                console.log( "altKeyUp" );
             }
         }
     },
@@ -220,6 +221,7 @@ exports.PanTool = Montage.create(toolBase,
                                         var tmpLocal   = MathUtils.transformAndDivideHomogeneousPoint( this._globalPt, globalToLocalMat );
 
                                         this._lastGPt = this._globalPt.slice();
+                                        this._lastY = this._lastGPt[1];
 
                                         // set up the matrices we will be needing
                                         var eltToStageWorldMat = glmat4.multiply( ucMat, viewUtils.getObjToStageWorldMatrix(elt, true), []);
@@ -275,14 +277,19 @@ exports.PanTool = Montage.create(toolBase,
                 {
                         if (this._isDrawing)
                         {
-                                //console.log( "PanTool.mouseMove (drag)" );
-
                                 // get the global screen point
                                 var gPt = [point.x, point.y, this._globalPt[2]];
+                                if (this._altKeyDown)
+                                {
+                                        var dy = 5*(point.y - this._lastY);
+                                        this._globalPt[2] += dy;
+                                        gPt = [this._lastGPt[0], this._lastGPt[1], this._globalPt[2]];
+                                }
 
                                 // update the scrollbars
                                 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;
@@ -297,27 +304,13 @@ exports.PanTool = Montage.create(toolBase,
                                 this.updateGlobalToUCWorldMatrix();
 
                                 var wPt = MathUtils.transformAndDivideHomogeneousPoint( gPt, this._globalToUCWorld );
-                                //console.log( "wPt: " + wPt );
                                 var delta = vecUtils.vecSubtract( 3, wPt, this._worldPt );
-                                if (this._altKeyDown)
-                                {
-                                        //console.log( "moveZ" );
-                                        var dist = vecUtils.vecMag(2, delta);
-                                        delta[0] = 0;  delta[1] = 0;  delta[2] = dist;
-                                        var dy = point.y - this._globalPt[1];
-                                        if (dy < 0)  delta[2] = -delta[2];
-                                }
-                                else
-                                {
-                                        console.log( "NOT MOVING Z" );
+                                
+                                if (!this._altKeyDown)
                                         delta[2] = 0;
-                                }
                                 var transMat = Matrix.Translation( delta );
                                 this._worldPt = wPt;
 
-                                if (this._altKeyDown)
-                                        this._globalPt[1] = point.y;
-
                                 // update everything
                                 this.applyDeltaMat( transMat );
                         }
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index fbf1693e..94d80b53 100644
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -94,6 +94,14 @@ exports.RectTool = Montage.create(ShapeTool, {
                 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
                 canvas.elementModel.shapeModel.stroke = strokeColor;
                 canvas.elementModel.shapeModel.fill = fillColor;
+                if(strokeColor)
+                {
+                    canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+                }
+                if(fillColor)