aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-07 16:43:22 -0800
committerArmen Kesablyan2012-02-07 16:43:22 -0800
commit7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (patch)
treec92d9cc664055640b3dac8b4edf9ae727dc5287d /js
parentd7ead10b566e7de121b2cd2c99fecca8469d63b8 (diff)
downloadninja-7f8730c3add146f1ba107e6fc22d1f5a8348ed8b.tar.gz
Refactored rich text editor location
Diffstat (limited to 'js')
-rw-r--r--js/components/tools-properties/text-properties.reel/text-properties.js1
-rw-r--r--js/stage/stage.reel/stage.html2
-rw-r--r--js/tools/TextTool.js2
3 files changed, 2 insertions, 3 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js
index de0b5fa3..dac30da0 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -61,7 +61,6 @@ exports.TextProperties = Montage.create(ToolProperties, {
61 61
62 handleEditorSelect: { 62 handleEditorSelect: {
63 value: function(e) { 63 value: function(e) {
64 console.log("hello");
65 this.application.ninja.stage.textTool.updateStates(); 64 this.application.ninja.stage.textTool.updateStates();
66 } 65 }
67 }, 66 },
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 07b823a7..623c54b8 100644
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -36,7 +36,7 @@
36 }, 36 },
37 37
38 "textTool": { 38 "textTool": {
39 "module": "montage/ui/rich-text-editor.reel", 39 "module": "node_modules/labs/rich-text-editor.reel",
40 "name": "RichTextEditor", 40 "name": "RichTextEditor",
41 "properties": { 41 "properties": {
42 "element" : {"#": "textToolObject"} 42 "element" : {"#": "textToolObject"}
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index 28e7ddf3..910a9eef 100644
--- 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
7var Montage = require("montage/core/core").Montage, 7var 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("montage/ui/rich-text-editor.reel").RichTextEditor; 9 RichTextEditor = require("node_modules/labs/rich-text-editor.reel").RichTextEditor;
10 10
11exports.TextTool = Montage.create(DrawingTool, { 11exports.TextTool = Montage.create(DrawingTool, {
12 12