diff options
| author | Kruti Shah | 2012-06-20 15:12:48 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-20 15:12:48 -0700 |
| commit | 1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch) | |
| tree | 26ff4c6c5a94accfd5801f124244d3eef152a5c7 /js/tools/TextTool.js | |
| parent | 1ce4bd7033a413c7697888e5712f278219d6d095 (diff) | |
| parent | 782b66c783df4a9c36fa240cc77900e69b9130cf (diff) | |
| download | ninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/tools/TextTool.js')
| -rwxr-xr-x | js/tools/TextTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js index 024a92ce..0aef6c1c 100755 --- a/js/tools/TextTool.js +++ b/js/tools/TextTool.js | |||
| @@ -6,7 +6,7 @@ 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 = ("node_modules/labs/rich-text-editor.reel").RichTextEditor, |
| 10 | ElementsMediator = require("js/mediators/element-mediator").ElementMediator; | 10 | ElementsMediator = require("js/mediators/element-mediator").ElementMediator; |
| 11 | 11 | ||
| 12 | exports.TextTool = Montage.create(DrawingTool, { | 12 | exports.TextTool = Montage.create(DrawingTool, { |