diff options
| author | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
| commit | cdd36ed6c789886657c967e72ec2dcd49c6c5a76 (patch) | |
| tree | b044208c38770c0c4edce03379071dbf2eb29b83 /js/tools/TextTool.js | |
| parent | c7ef6951baff283266df7567e30c8074dda4ad01 (diff) | |
| parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
| download | ninja-cdd36ed6c789886657c967e72ec2dcd49c6c5a76.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/document/html-document.js
Diffstat (limited to 'js/tools/TextTool.js')
| -rwxr-xr-x | js/tools/TextTool.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js index 760af55b..4c464173 100755 --- a/js/tools/TextTool.js +++ b/js/tools/TextTool.js | |||
| @@ -21,6 +21,7 @@ exports.TextTool = Montage.create(DrawingTool, { | |||
| 21 | this.selectedElement.innerHTML = this.application.ninja.stage.textTool.value; | 21 | this.selectedElement.innerHTML = this.application.ninja.stage.textTool.value; |
| 22 | this.application.ninja.stage.textTool.value = ""; | 22 | this.application.ninja.stage.textTool.value = ""; |
| 23 | this.application.ninja.stage.textTool.element.style.display = "none"; | 23 | this.application.ninja.stage.textTool.element.style.display = "none"; |
| 24 | this.applyElementStyles(this.application.ninja.stage.textTool.element.firstChild, this.selectedElement, ["color"]); | ||
| 24 | } | 25 | } |
| 25 | //Set Selected Element | 26 | //Set Selected Element |
| 26 | this._selectedElement = val; | 27 | this._selectedElement = val; |