Merge branch 'master' into pentool

8 files changed, 32 insertions, 21 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 4e13bd43..ded56ecc 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -417,6 +417,9 @@ exports.BrushTool = Montage.create(ShapeTool, {
                         // TODO - update the shape's info only.  shapeModel will likely need an array of shapes.
                     }
 
+                    //now send the event that will add this canvas to the timeline
+                    NJevent("elementAdded", newCanvas);
+
                     //if(newCanvas.elementModel.isShape)
                     if (true)
                     {
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index d627f03b..346975b2 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -104,7 +104,7 @@ exports.EyedropperTool = Montage.create(toolBase, {
         value : function (event) {
             var c,
                 color,
-                obj = this.application.ninja.stage.GetElement(event);
+                obj = this.application.ninja.stage.getElement(event);
             if (obj)
             {
                 if(this.application.ninja.currentDocument.inExclusion(obj) !== -1)
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 746f20cf..87a093ff 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -22,7 +22,7 @@ exports.FillTool = Montage.create(ModifierToolBase, {
     HandleMouseMove: {
         value : function (event)
                 {
-            var obj = this.application.ninja.stage.GetSelectableElement(event);
+            var obj = this.application.ninja.stage.getElement(event, true);
             var cursor = "url('images/cursors/fill.png') 14 14, default";
             var canColor = true;
             if (obj)
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index 95c2e71d..fd17f4d6 100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -16,7 +16,7 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, {
     HandleMouseMove: {
         value : function (event)
                 {
-            var obj = this.application.ninja.stage.GetSelectableElement(event);
+            var obj = this.application.ninja.stage.getElement(event, true);
             var cursor = "url('images/cursors/ink.png') 6 11, default";
             var canColor = true;
             if (obj)
@@ -84,14 +84,22 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, {
                                 };
                 }
 
-                colorInfo.borderInfo = { borderStyle:this.options._borderStyle.value,
-                                         borderWidth:this.options._borderWidth.value,
-                                         borderUnits:this.options._borderWidth.units
-                                       };
+                if(this.options.useBorderWidth.checked || this.options.useBorderStyle.checked) {
+                    colorInfo.borderInfo = {};
+                    if(this.options.useBorderWidth.checked) {
+                        colorInfo.borderInfo.borderWidth = this.options._borderWidth.value;
+                        colorInfo.borderInfo.borderUnits = this.options._borderWidth.units;
+                    }
+                    if(this.options.useBorderStyle.checked) {
+                        colorInfo.borderInfo.borderStyle = this.options._borderStyle.value;
+                    }
+                }
 
-                colorInfo.strokeInfo = { strokeSize:this.options._strokeSize.value,
-                                         strokeUnits:this.options._strokeSize.units
-                                       };
+                if(this.options.useStrokeSize.checked) {
+                    colorInfo.strokeInfo = {};
+                    colorInfo.strokeInfo.strokeSize = this.options._strokeSize.value;
+                    colorInfo.strokeInfo.strokeUnits = this.options._strokeSize.units;
+                }
 
                 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, false, "Change", "inkBottleTool");
             }
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index f3b5e92d..21a5a025 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -138,7 +138,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
         _showFeedbackOnMouseMove: {
                 value: function (event) {
                         // TODO - This call is causing the canvas to redraw 3 times per mouse move
-                        var targetedObject = this.application.ninja.stage.GetSelectableElement(event);
+                        var targetedObject = this.application.ninja.stage.getElement(event, true);
 
                         if (targetedObject) {
                                 if((targetedObject.nodeName === "CANVAS") && !ShapesController.isElementAShape(targetedObject))
diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js
index 678d03ac..f43b1b58 100755
--- a/js/tools/ToolBase.js
+++ b/js/tools/ToolBase.js
@@ -89,9 +89,9 @@ exports.toolBase = Montage.create(Component, {
 
             if(this._canOperateOnStage) {
                 if(event.shiftKey) {
-                    this.application.ninja.selectionController.shiftSelectElement(this.application.ninja.stage.GetElement(event));
+                    this.application.ninja.selectionController.shiftSelectElement(this.application.ninja.stage.getElement(event));
                 } else {
-                    this.application.ninja.selectionController.selectElement(this.application.ninja.stage.GetElement(event));
+                    this.application.ninja.selectionController.selectElement(this.application.ninja.stage.getElement(event));
                 }
             }
 
@@ -109,13 +109,13 @@ exports.toolBase = Montage.create(Component, {
         value:function(event){
             var upperBoundary ,previousZoomValue;
 
-            previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ;
+            previousZoomValue = this.application.ninja.documentBar.zoomFactor;
             upperBoundary = previousZoomValue *1.2 ;
             
             if(upperBoundary > 2000)
-                this.application.Ninja._documentBarRef.zoomFactor = 2000;
+                this.application.ninja.documentBar.zoomFactor = 2000;
             else
-                this.application.Ninja._documentBarRef.zoomFactor*= 1.2;
+                this.application.ninja.documentBar.zoomFactor*= 1.2;
 
         }
     },
@@ -124,13 +124,13 @@ exports.toolBase = Montage.create(Component, {
         value:function(){
             var lowerBoundary ,previousZoomValue;
             
-            previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ;
+            previousZoomValue = this.application.ninja.documentBar.zoomFactor ;
             lowerBoundary = previousZoomValue/1.2 ;
 
             if(lowerBoundary < 25)
-                this.application.Ninja._documentBarRef.zoomFactor = 25;
+                this.application.ninja.documentBar.zoomFactor = 25;
             else
-                this.application.Ninja._documentBarRef.zoomFactor/= 1.2;
+                this.application.ninja.documentBar.zoomFactor/= 1.2;
         }
     },
 
diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index 72a55322..b4f55bd9 100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
@@ -83,7 +83,7 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
                     // Check that hitRec's element matches element that browser says we clicked on
                     // TODO - This is still not working when using a handle that is on top of an
                     // element that is not currently selected
-                    var elt = this.application.ninja.stage.GetSelectableElement(event);
+                    var elt = this.application.ninja.stage.getElement(event, true);
                     if(elt && (elt !== hitRec.getElement()))
                     {
                         hitRec = snapManager.findHitRecordForElement(elt);
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 2e006c35..d023206a 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -134,7 +134,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                                 var hitRec = snapManager.snap(point.x, point.y, do3DSnap);
 
                 // TODO - Check that hitRec's element matches element that browser says we clicked on
-                var elt = this.application.ninja.stage.GetSelectableElement(event);
+                var elt = this.application.ninja.stage.getElement(event, true);
                 if(elt !== hitRec.getElement())
                 {
                     hitRec = snapManager.findHitRecordForElement(elt);