Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

5 files changed, 10 insertions, 6 deletions

diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 6a56004d..30a6a48b 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -240,7 +240,7 @@ exports.EyedropperTool = Montage.create(toolBase, {
             else
             {
                 this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: eventType};
-                this.application.ninja.colorController.colorModel.applyNoColor();
+                this.application.ninja.colorController.colorModel.applyNoColor(true);
                 if(updateColorToolBar)
                 {
                     this._previousColor = "none";
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 40475908..07429bc0 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -237,7 +237,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 33ca5c71..2cffb44d 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -204,10 +204,12 @@ exports.PenTool = Montage.create(ShapeTool, {
             this.application.ninja.stage.clearDrawingCanvas();//stageManagerModule.stageManager.clearDrawingCanvas();
 
             //undo/redo...go through ElementController and NJEvent
-            var els = [];
-            ElementController.removeElement(this._selectedSubpathCanvas);
-            els.push(this._selectedSubpathCanvas);
-            NJevent( "elementsRemoved", els );
+            if (this._selectedSubpathCanvas) {
+                var els = [];
+                ElementController.removeElement(this._selectedSubpathCanvas);
+                els.push(this._selectedSubpathCanvas);
+                NJevent( "elementsRemoved", els );
+            }
             this._selectedSubpathCanvas = null;
         }
     },
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 493f4aa2..8b644d4a 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -228,6 +228,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             } else {
                 this.application.ninja.currentDocument.model.domContainer = this.application.ninja.currentDocument.model.documentRoot;
             }
+            this.application.ninja.selectionController.executeSelectElement();
         }
     },
 
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index 508e2a85..fac6798f 100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -86,6 +86,7 @@ exports.TagTool = Montage.create(DrawingTool, {
             // Create the element
             if(this.options.selectedElement === "custom") {
                 element = document.application.njUtils.make(this.options.customName.value, null, this.application.ninja.currentDocument);
+
             } else {
                 element = document.application.njUtils.make(this.options.selectedElement, null, this.application.ninja.currentDocument);
             }