diff options
author | Valerio Virgillito | 2012-03-28 11:07:04 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-28 11:07:04 -0700 |
commit | a25e50a429dfa87522ed7616dcae7b472f3c785c (patch) | |
tree | 11c85d77a9bf8ff5781891e4c2b0e2edd6e7351e /js/tools | |
parent | 119f5902df944f2f92ea18de0ab634df7a55d879 (diff) | |
parent | bfd796e47c856c6620dc4b32ac6c710d4a493d3a (diff) | |
download | ninja-a25e50a429dfa87522ed7616dcae7b472f3c785c.tar.gz |
Merge pull request #145 from ericguzman/PresetsPI
Presets - Adding presets controller
Diffstat (limited to 'js/tools')
-rwxr-xr-x | js/tools/TextTool.js | 5 |
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 | ||
7 | var Montage = require("montage/core/core").Montage, | 7 | var 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 | ||
11 | exports.TextTool = Montage.create(DrawingTool, { | 12 | exports.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; |