diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
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 | 41 |
1 files changed, 41 insertions, 0 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 new file mode 100644 index 00000000..03724a92 --- /dev/null +++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html | |||
@@ -0,0 +1,41 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html> | ||
8 | <head> | ||
9 | <title></title> | ||
10 | <link rel="stylesheet" type="text/css" href="rich-text-editor.css"> | ||
11 | <script type="text/montage-serialization"> | ||
12 | { | ||
13 | "overlay": { | ||
14 | "module": "montage/ui/slot.reel", | ||
15 | "name": "Slot", | ||
16 | "properties": { | ||
17 | "element": {"#": "editor-slot"}, | ||
18 | "delegate": {"@": "owner"} | ||
19 | } | ||
20 | }, | ||
21 | |||
22 | "owner": { | ||
23 | "module": "montage/ui/rich-text-editor/rich-text-editor.reel", | ||
24 | "name": "RichTextEditor", | ||
25 | "properties": { | ||
26 | "element": {"#": "rich-text-editor-container"}, | ||
27 | "_overlaySlot": {"@": "overlay"} | ||
28 | } | ||
29 | } | ||
30 | } | ||
31 | </script> | ||
32 | |||
33 | </head> | ||
34 | <body> | ||
35 | <div id="rich-text-editor-container"> | ||
36 | <div class="montage-editor" contenteditable="false"></div> | ||
37 | <div id="editor-slot" class="montage-editor-overlay"></div> | ||
38 | </div> | ||
39 | </body> | ||
40 | </html> | ||
41 | |||