diff options
| author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
| commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
| tree | e408be732a3eee71229bfc7dbf7cace998ce18de /js/tools | |
| parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
| parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
| download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/tools')
| -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 cff3b6e3..7f82855b 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, { |