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 /node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html | |
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 '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 | 38 |
1 files changed, 18 insertions, 20 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 9cebd32e..2e773e5f 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 | |||
@@ -6,28 +6,27 @@ | |||
6 | </copyright> --> | 6 | </copyright> --> |
7 | <html> | 7 | <html> |
8 | <head> | 8 | <head> |
9 | <title></title> | 9 | <meta charset="utf-8"> |
10 | <link rel="stylesheet" type="text/css" href="rich-text-editor.css"> | 10 | <link rel="stylesheet" href="rich-text-editor.css"> |
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "overlay": { | 13 | "overlay": { |
14 | "prototype": "ui/slot.reel", | 14 | "prototype": "ui/slot.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "editor-slot"}, | 16 | "element": {"#": "editor-slot"}, |
17 | "delegate": {"@": "owner"} | 17 | "delegate": {"@": "owner"} |
18 | } | 18 | } |
19 | }, | 19 | }, |
20 | 20 | ||
21 | "owner": { | 21 | "owner": { |
22 | "prototype": "ui/rich-text-editor/rich-text-editor.reel", | 22 | "prototype": "ui/rich-text-editor/rich-text-editor.reel", |
23 | "properties": { | 23 | "properties": { |
24 | "element": {"#": "rich-text-editor-container"}, | 24 | "element": {"#": "rich-text-editor-container"}, |
25 | "_overlaySlot": {"@": "overlay"} | 25 | "_overlaySlot": {"@": "overlay"} |
26 | } | ||
27 | } | ||
28 | } | 26 | } |
27 | } | ||
28 | } | ||
29 | </script> | 29 | </script> |
30 | |||
31 | </head> | 30 | </head> |
32 | <body> | 31 | <body> |
33 | <div data-montage-id="rich-text-editor-container"> | 32 | <div data-montage-id="rich-text-editor-container"> |
@@ -35,5 +34,4 @@ | |||
35 | <div data-montage-id="editor-slot" class="montage-editor-overlay"></div> | 34 | <div data-montage-id="editor-slot" class="montage-editor-overlay"></div> |
36 | </div> | 35 | </div> |
37 | </body> | 36 | </body> |
38 | </html> | 37 | </html> \ No newline at end of file |
39 | |||