diff options
author | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
commit | 2e04af953463643791f6362bd8ef4c6ba190abfa (patch) | |
tree | d07aaf646091ddf9dad5b030a7905055fd323490 /node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz |
Squashed commit of the following:
commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 18 13:48:21 2012 -0700
Merge branch 'refs/heads/master' into integration
commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:29:41 2012 -0700
updating the picasa carousel
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:03:50 2012 -0700
Merge branch 'refs/heads/master' into integration
commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 11 10:39:36 2012 -0700
integrating new picasa carousel component
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 10 14:33:00 2012 -0700
fixed the text area case issue
Text area was renamed from TextArea to Textarea
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date: Mon Apr 9 22:10:45 2012 -0700
integrating montage v0.8 into ninja.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Signed-off-by: Valerio Virgillito <valerio@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 | 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 | |||