diff options
author | hwc487 | 2012-04-27 14:35:46 -0700 |
---|---|---|
committer | hwc487 | 2012-04-27 14:35:46 -0700 |
commit | 1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch) | |
tree | 3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/components/treeview/leaf.reel/leaf.html | |
parent | 5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/treeview/leaf.reel/leaf.html')
-rw-r--r-- | js/components/treeview/leaf.reel/leaf.html | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html index cf0b4e40..360b85a9 100644 --- a/js/components/treeview/leaf.reel/leaf.html +++ b/js/components/treeview/leaf.reel/leaf.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -11,16 +11,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "module" : "js/components/treeview/leaf.reel", | 14 | "prototype" : "js/components/treeview/leaf.reel", |
15 | "name" : "Leaf", | ||
16 | "properties" : { | 15 | "properties" : { |
17 | "element" : {"#" : "leaf"}, | 16 | "element" : {"#" : "leaf"}, |
18 | "label" : { "@" : "textComponent" } | 17 | "label" : { "@" : "textComponent" } |
19 | } | 18 | } |
20 | }, | 19 | }, |
21 | "textComponent" : { | 20 | "textComponent" : { |
22 | "module" : "montage/ui/dynamic-text.reel", | 21 | "prototype" : "montage/ui/dynamic-text.reel", |
23 | "name" : "DynamicText", | ||
24 | "properties" : { | 22 | "properties" : { |
25 | "element" : { "#" : "label" } | 23 | "element" : { "#" : "label" } |
26 | }, | 24 | }, |