diff options
-rw-r--r-- | js/components/tools-properties/text-properties.reel/text-properties.js | 1 | ||||
-rw-r--r-- | js/stage/stage.reel/stage.html | 2 | ||||
-rw-r--r-- | js/tools/TextTool.js | 2 | ||||
-rw-r--r-- | node_modules/labs/rich-text-editor.reel/rich-text-editor.css (renamed from node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.css) | 0 | ||||
-rw-r--r-- | node_modules/labs/rich-text-editor.reel/rich-text-editor.html (renamed from node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.html) | 2 | ||||
-rw-r--r-- | node_modules/labs/rich-text-editor.reel/rich-text-editor.js (renamed from node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.js) | 11 | ||||
-rw-r--r-- | node_modules/labs/rich-text-editor.reel/rich-text-resizer.js (renamed from node_modules/montage/ui/rich-text-editor.reel/rich-text-resizer.js) | 6 | ||||
-rw-r--r-- | node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js (renamed from node_modules/montage/ui/rich-text-editor.reel/rich-text-sanitizer.js) | 0 | ||||
-rw-r--r-- | node_modules/labs/rich-text-editor.reel/shortcut-manager.js (renamed from node_modules/montage/ui/rich-text-editor.reel/shortcut-manager.js) | 0 |
9 files changed, 11 insertions, 13 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 | ||
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("montage/ui/rich-text-editor.reel").RichTextEditor; | 9 | RichTextEditor = require("node_modules/labs/rich-text-editor.reel").RichTextEditor; |
10 | 10 | ||
11 | exports.TextTool = Montage.create(DrawingTool, { | 11 | exports.TextTool = Montage.create(DrawingTool, { |
12 | 12 | ||
diff --git a/node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.css b/node_modules/labs/rich-text-editor.reel/rich-text-editor.css index 656183c4..656183c4 100644 --- a/node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.css +++ b/node_modules/labs/rich-text-editor.reel/rich-text-editor.css | |||
diff --git a/node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.html b/node_modules/labs/rich-text-editor.reel/rich-text-editor.html index 0856043f..42425b40 100644 --- a/node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.html +++ b/node_modules/labs/rich-text-editor.reel/rich-text-editor.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "module": "montage/ui/rich-text-editor.reel", | 14 | "module": "node_modules/labs/rich-text-editor.reel", |
15 | "name": "RichTextEditor", | 15 | "name": "RichTextEditor", |
16 | "properties": { | 16 | "properties": { |
17 | 17 | ||
diff --git a/node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.js b/node_modules/labs/rich-text-editor.reel/rich-text-editor.js index 37fb9599..3fece294 100644 --- a/node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.js +++ b/node_modules/labs/rich-text-editor.reel/rich-text-editor.js | |||
@@ -7,12 +7,11 @@ | |||
7 | @module "montage/ui/rich-text-editor.reel" | 7 | @module "montage/ui/rich-text-editor.reel" |
8 | @requires montage/core/core | 8 | @requires montage/core/core |
9 | */ | 9 | */ |
10 | var Montage = require("montage").Montage, | 10 | var Montage = require("montage/core/core").Montage, |
11 | Component = require("ui/component").Component, | 11 | Component = require("montage/ui/component").Component, |
12 | MutableEvent = require("core/event/mutable-event").MutableEvent, | 12 | MutableEvent = require("montage/core/event/mutable-event").MutableEvent, |
13 | Resizer = require("./rich-text-resizer").Resizer, | 13 | Resizer = require("node_modules/labs/rich-text-editor.reel/rich-text-resizer").Resizer, |
14 | Sanitizer = require("./rich-text-sanitizer").Sanitizer, | 14 | Sanitizer = require("node_modules/labs/rich-text-editor.reel/rich-text-sanitizer").Sanitizer; |
15 | Point = require("core/geometry/point").Point; | ||
16 | 15 | ||
17 | /** | 16 | /** |
18 | @class module:"montage/ui/rich-text-editor.reel".RichTextEditor | 17 | @class module:"montage/ui/rich-text-editor.reel".RichTextEditor |
diff --git a/node_modules/montage/ui/rich-text-editor.reel/rich-text-resizer.js b/node_modules/labs/rich-text-editor.reel/rich-text-resizer.js index 83e3b0e0..5da834f4 100644 --- a/node_modules/montage/ui/rich-text-editor.reel/rich-text-resizer.js +++ b/node_modules/labs/rich-text-editor.reel/rich-text-resizer.js | |||
@@ -7,9 +7,9 @@ | |||
7 | @module "montage/ui/rich-text-resizer.js" | 7 | @module "montage/ui/rich-text-resizer.js" |
8 | @requires montage/core/core | 8 | @requires montage/core/core |
9 | */ | 9 | */ |
10 | var Montage = require("montage").Montage, | 10 | var Montage = require("montage/core/core").Montage, |
11 | dom = require("ui/dom"), | 11 | dom = require("montage/ui/dom"), |
12 | Point = require("core/geometry/point").Point; | 12 | Point = require("montage/core/geometry/point").Point; |
13 | 13 | ||
14 | /** | 14 | /** |
15 | @class module:"montage/ui/rich-text-resizer.js".Resizer | 15 | @class module:"montage/ui/rich-text-resizer.js".Resizer |
diff --git a/node_modules/montage/ui/rich-text-editor.reel/rich-text-sanitizer.js b/node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js index 3282d3e6..3282d3e6 100644 --- a/node_modules/montage/ui/rich-text-editor.reel/rich-text-sanitizer.js +++ b/node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js | |||
diff --git a/node_modules/montage/ui/rich-text-editor.reel/shortcut-manager.js b/node_modules/labs/rich-text-editor.reel/shortcut-manager.js index dac1b638..dac1b638 100644 --- a/node_modules/montage/ui/rich-text-editor.reel/shortcut-manager.js +++ b/node_modules/labs/rich-text-editor.reel/shortcut-manager.js | |||