Merge branch 'refs/heads/master' into new-tool-icons

26 files changed, 20 insertions, 28 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index ce8ffbb9..4d44326f 100644..100755
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -201,7 +201,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
             var top = Math.round(midPt[1] - 0.5 * h);
 
             if (!canvas) {
-                var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", null, true);
+                var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
                 var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas);
                 ElementMediator.addElement(newCanvas, elementModel.data, true);
 
diff --git a/js/tools/EraserTool.js b/js/tools/EraserTool.js
index c12a14b1..c12a14b1 100644..100755
--- a/js/tools/EraserTool.js
+++ b/js/tools/EraserTool.js
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 795753d2..795753d2 100644..100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index fabcec69..fabcec69 100644..100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index cc20d94c..cc20d94c 100644..100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 99c374a7..233316a5 100644..100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -82,7 +82,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                         h += ~~(yAdj*2);
                     }
 
-                    canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", null, true);
+                    canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
                     var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas);
 
                     ElementMediator.addElement(canvas, elementModel.data, true);
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 14655312..14655312 100644..100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index 71301d46..71301d46 100644..100755
--- a/js/tools/PanTool.js
+++ b/js/tools/PanTool.js
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 9a69b53d..7749d525 100644..100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -570,7 +570,7 @@ exports.PenTool = Montage.create(ShapeTool, {
 
             if (!canvas) {
                 var newCanvas = null;
-                newCanvas = NJUtils.makeNJElement("canvas", "Subpath", "shape", null, true);
+                newCanvas = NJUtils.makeNJElement("canvas", "Subpath", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
                 var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas);
                 ElementMediator.addElement(newCanvas, elementModel.data, true);
 
diff --git a/js/tools/PencilTool.js b/js/tools/PencilTool.js
index 349eb1e8..349eb1e8 100644..100755
--- a/js/tools/PencilTool.js
+++ b/js/tools/PencilTool.js
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index 31ac7faa..31ac7faa 100644..100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index aa91b2f4..aa91b2f4 100644..100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
diff --git a/js/tools/RotateObject3DTool.js b/js/tools/RotateObject3DTool.js
index 72af6eff..72af6eff 100644..100755
--- a/js/tools/RotateObject3DTool.js
+++ b/js/tools/RotateObject3DTool.js
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index ca2a8bf3..ca2a8bf3 100644..100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 48548271..37029e8c 100644..100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -115,8 +115,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
     HandleLeftButtonUp: {
         value: function(event) {
             var selectedItems,
-                point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
-                                                                    new WebKitPoint(event.pageX, event.pageY));
+                point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
 
             this.isDrawing = false;
             this.application.ninja.stage.showSelectionBounds = true;
@@ -184,28 +183,21 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
         }
     },
 
+    /**
+     * Double click handler
+     *
+     * Sets the currentSelectionContainer to the current selected element. If no elements are selected set the
+     * currentSelectionContainer to the userDocument div.
+     */
     HandleDoubleClick: {
-            value: function(event) {
-                /*
-                var selectedObject = stageManagerModule.stageManager.GetObjectFromPoint(event.layerX, event.layerY, this._canOperateOnStage);
-
-                if(selectedObject) {
-                    if(selectionManagerModule.selectionManager.findSelectedElement(selectedObject) === -1) {
-                        selectionManagerModule.selectionManager.setSingleSelection(selectedObject);
-                    }
-                }
-                */
-
-                // Temporary Code for Breadcrumb
-                if(this.application.ninja.selectedElements.length > 0) {
-                    this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]._element;
-                } else {
-                    console.log(this.application.ninja.currentDocument.documentRoot.uuid);
-                    this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot;
-                }
-
+        value: function(event) {
+            if(this.application.ninja.selectedElements.length > 0) {
+                this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]._element;
+            } else {
+                this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot;
             }
-        },
+        }
+    },
 
     HandleKeyPress: {
         value: function(event){
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 4ccb7a8d..29e9b99f 100644..100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -66,7 +66,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                 var canvas;
                 if(!this._useExistingCanvas())
                 {
-                    canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", null, true);
+                    canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
                     var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height,
                                                                         drawData.planeMat, drawData.midPt, canvas);
 
diff --git a/js/tools/SubSelectTool.js b/js/tools/SubSelectTool.js
index 12f0e5c0..12f0e5c0 100644..100755
--- a/js/tools/SubSelectTool.js
+++ b/js/tools/SubSelectTool.js
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index e3f49bbe..e3f49bbe 100644..100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index 760af55b..4c464173 100644..100755
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -21,6 +21,7 @@ exports.TextTool = Montage.create(DrawingTool, {
                 this.selectedElement.innerHTML = this.application.ninja.stage.textTool.value;
                 this.application.ninja.stage.textTool.value = "";
                 this.application.ninja.stage.textTool.element.style.display = "none";
+                this.applyElementStyles(this.application.ninja.stage.textTool.element.firstChild, this.selectedElement, ["color"]);
             }
             //Set Selected Element
             this._selectedElement = val;
diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js
index 678d03ac..678d03ac 100644..100755
--- a/js/tools/ToolBase.js
+++ b/js/tools/ToolBase.js
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index cbf76830..cbf76830 100644..100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index bbbbc871..bbbbc871 100644..100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
diff --git a/js/tools/ZoomTool.js b/js/tools/ZoomTool.js
index 4b6705c1..4b6705c1 100644..100755
--- a/js/tools/ZoomTool.js
+++ b/js/tools/ZoomTool.js
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index cd895102..cd895102 100644..100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
diff --git a/js/tools/drawing-tool.js b/js/tools/drawing-tool.js
index 603f63a3..603f63a3 100644..100755
--- a/js/tools/drawing-tool.js
+++ b/js/tools/drawing-tool.js
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 67b217c4..54bc06be 100644..100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -791,8 +791,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
     HandleLeftButtonDown: {
         value: function(event) {
 
-            var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
-                                                        new WebKitPoint(event.pageX, event.pageY));
+            var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
             this.downPoint.x = point.x;
             this.downPoint.y = point.y;