Merge branch 'refs/heads/master' into components

26 files changed, 1 insertions, 0 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index ce8ffbb9..ce8ffbb9 100644..100755
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
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..99c374a7 100644..100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
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..9a69b53d 100644..100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
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..48548271 100644..100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 4ccb7a8d..4ccb7a8d 100644..100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
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..67b217c4 100644..100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js