aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-28 11:49:39 -0700
committerPushkar Joshi2012-03-28 11:49:39 -0700
commit22f0b9c06d8964f473dcb70dc3e2f8acac71bb0a (patch)
tree4adc40f81090a4f3f3165c3cbd6b90152dec53e6 /js/tools
parent3fd098981077e40841c013a8ac305036d08a215b (diff)
parentfa5c9dbdc3e8618d494e142e0967fa69049d0c97 (diff)
downloadninja-22f0b9c06d8964f473dcb70dc3e2f8acac71bb0a.tar.gz
Merge branch 'brushtool' into pentool
Diffstat (limited to 'js/tools')
-rwxr-xr-xjs/tools/TextTool.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index 4c464173..d27a32bb 100755
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -6,7 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
6 6
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 DrawingTool = require("js/tools/drawing-tool").DrawingTool; 8 DrawingTool = require("js/tools/drawing-tool").DrawingTool;
9 RichTextEditor = require("node_modules/labs/rich-text-editor.reel").RichTextEditor; 9 RichTextEditor = require("node_modules/labs/rich-text-editor.reel").RichTextEditor,
10 ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
10 11
11exports.TextTool = Montage.create(DrawingTool, { 12exports.TextTool = Montage.create(DrawingTool, {
12 13
@@ -21,7 +22,7 @@ exports.TextTool = Montage.create(DrawingTool, {
21 this.selectedElement.innerHTML = this.application.ninja.stage.textTool.value; 22 this.selectedElement.innerHTML = this.application.ninja.stage.textTool.value;
22 this.application.ninja.stage.textTool.value = ""; 23 this.application.ninja.stage.textTool.value = "";
23 this.application.ninja.stage.textTool.element.style.display = "none"; 24 this.application.ninja.stage.textTool.element.style.display = "none";
24 this.applyElementStyles(this.application.ninja.stage.textTool.element.firstChild, this.selectedElement, ["color"]); 25 ElementsMediator.setProperty(this.application.ninja.selectedElements, "color", [window.getComputedStyle(this.application.ninja.stage.textTool.element.firstChild)["color"]], "Change", "textTool");
25 } 26 }
26 //Set Selected Element 27 //Set Selected Element
27 this._selectedElement = val; 28 this._selectedElement = val;