diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html')
-rw-r--r-- | node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html index 03724a92..cd180dcc 100644 --- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html +++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html | |||
@@ -11,8 +11,7 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "overlay": { | 13 | "overlay": { |
14 | "module": "montage/ui/slot.reel", | 14 | "prototype": "montage/ui/slot.reel", |
15 | "name": "Slot", | ||
16 | "properties": { | 15 | "properties": { |
17 | "element": {"#": "editor-slot"}, | 16 | "element": {"#": "editor-slot"}, |
18 | "delegate": {"@": "owner"} | 17 | "delegate": {"@": "owner"} |
@@ -20,8 +19,7 @@ | |||
20 | }, | 19 | }, |
21 | 20 | ||
22 | "owner": { | 21 | "owner": { |
23 | "module": "montage/ui/rich-text-editor/rich-text-editor.reel", | 22 | "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel", |
24 | "name": "RichTextEditor", | ||
25 | "properties": { | 23 | "properties": { |
26 | "element": {"#": "rich-text-editor-container"}, | 24 | "element": {"#": "rich-text-editor-container"}, |
27 | "_overlaySlot": {"@": "overlay"} | 25 | "_overlaySlot": {"@": "overlay"} |
@@ -32,9 +30,9 @@ | |||
32 | 30 | ||
33 | </head> | 31 | </head> |
34 | <body> | 32 | <body> |
35 | <div id="rich-text-editor-container"> | 33 | <div data-montage-id="rich-text-editor-container"> |
36 | <div class="montage-editor" contenteditable="false"></div> | 34 | <div class="montage-editor" contenteditable="false"></div> |
37 | <div id="editor-slot" class="montage-editor-overlay"></div> | 35 | <div data-montage-id="editor-slot" class="montage-editor-overlay"></div> |
38 | </div> | 36 | </div> |
39 | </body> | 37 | </body> |
40 | </html> | 38 | </html> |