aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/treeview.reel/treeview.html
diff options
context:
space:
mode:
authorEric Guzman2012-04-30 13:48:43 -0700
committerEric Guzman2012-04-30 13:48:43 -0700
commit23d8efd4ed9e8fd43f516595009679fb44c8096d (patch)
tree7d5be06e6417102702a49ece24fca82528aced7a /js/components/treeview/treeview.reel/treeview.html
parentae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/treeview/treeview.reel/treeview.html')
-rw-r--r--js/components/treeview/treeview.reel/treeview.html17
1 files changed, 6 insertions, 11 deletions
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html
index 4f9e6a72..3ef9f116 100644
--- a/js/components/treeview/treeview.reel/treeview.html
+++ b/js/components/treeview/treeview.reel/treeview.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@ 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/treeview.reel", 14 "prototype" : "js/components/treeview/treeview.reel",
15 "name" : "Treeview",
16 "properties" : { 15 "properties" : {
17 "element" : { "#" : "treeView"}, 16 "element" : { "#" : "treeView"},
18 "defaultBranchComponent" : { "@" : "defaultBranch"}, 17 "defaultBranchComponent" : { "@" : "defaultBranch"},
@@ -22,24 +21,20 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
22 } 21 }
23 }, 22 },
24 "defaultBranch" : { 23 "defaultBranch" : {
25 "module" : "js/components/treeview/branch.reel", 24 "prototype" : "js/components/treeview/branch.reel"
26 "name" : "Branch"
27 }, 25 },
28 "defaultLeaf" : { 26 "defaultLeaf" : {
29 "module" : "js/components/treeview/leaf.reel", 27 "prototype" : "js/components/treeview/leaf.reel"
30 "name" : "Leaf"
31 }, 28 },
32 "scrollview": { 29 "scrollview": {
33 "module": "montage/ui/scrollview.reel", 30 "prototype": "montage/ui/scrollview.reel[Scrollview]",
34 "name": "Scrollview",
35 "properties": { 31 "properties": {
36 "element": {"#": "treeView"}, 32 "element": {"#": "treeView"},
37 "axis": "vertical" 33 "axis": "vertical"
38 } 34 }
39 }, 35 },
40 "slot": { 36 "slot": {
41 "module": "montage/ui/slot.reel", 37 "prototype": "montage/ui/slot.reel",
42 "name": "Slot",
43 "properties": { 38 "properties": {
44 "element": {"#": "rootBranch"} 39 "element": {"#": "rootBranch"}
45 } 40 }