aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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.html4
1 files changed, 2 insertions, 2 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 cd180dcc..9cebd32e 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,7 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "overlay": { 13 "overlay": {
14 "prototype": "montage/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"}
@@ -19,7 +19,7 @@
19 }, 19 },
20 20
21 "owner": { 21 "owner": {
22 "prototype": "montage/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"}