diff options
| author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
| commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
| tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /js/tools/TextTool.js | |
| parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
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, { |