aboutsummaryrefslogtreecommitdiff
path: root/js/tools/TextTool.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-24 09:46:47 -0700
committerJose Antonio Marquez2012-07-24 09:46:47 -0700
commit2f32323d6d5a65feaaa53461a80fcef297a5b65a (patch)
tree0956c504a462609f3818052ab6a641c520b12dd5 /js/tools/TextTool.js
parent2952c2465b9a66076344087f899c5c836ad15ad6 (diff)
parent55a69aeb3c66b533d5a2d27d7548471c2c8b5dfc (diff)
downloadninja-2f32323d6d5a65feaaa53461a80fcef297a5b65a.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to 'js/tools/TextTool.js')
-rwxr-xr-xjs/tools/TextTool.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index b98da3e6..d04254b0 100755
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -30,8 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
30</copyright> */ 30</copyright> */
31 31
32var Montage = require("montage/core/core").Montage, 32var Montage = require("montage/core/core").Montage,
33 DrawingTool = require("js/tools/drawing-tool").DrawingTool, 33 DrawingTool = require("js/tools/drawing-tool").DrawingTool;
34 ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
35 34
36exports.TextTool = Montage.create(DrawingTool, { 35exports.TextTool = Montage.create(DrawingTool, {
37 drawingFeedback: { 36 drawingFeedback: {
@@ -175,8 +174,7 @@ exports.TextTool = Montage.create(DrawingTool, {
175 self.applyElementStyles(self.selectedElement, self.application.ninja.stage.textTool.element, ["font","padding-left","padding-top","padding-right","padding-bottom", "color"]); 174 self.applyElementStyles(self.selectedElement, self.application.ninja.stage.textTool.element, ["font","padding-left","padding-top","padding-right","padding-bottom", "color"]);
176 this.selectAll(); 175 this.selectAll();
177 this.didDraw = function() {}; 176 this.didDraw = function() {};
178 } 177 };
179
180 } 178 }
181 }, 179 },
182 180