diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/treeview/treeview.reel | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/treeview/treeview.reel')
| -rw-r--r-- | js/components/treeview/treeview.reel/treeview.html | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html index 4f9e6a72..1bed0f0b 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> |
| 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,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 | } |
| @@ -48,8 +43,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 48 | </script> | 43 | </script> |
| 49 | </head> | 44 | </head> |
| 50 | <body> | 45 | <body> |
| 51 | <div id="treeView" class="treeView"> | 46 | <div data-montage-id="treeView" class="treeView"> |
| 52 | <div id="rootBranch" class="treeRoot"></div> | 47 | <div data-montage-id="rootBranch" class="treeRoot"></div> |
| 53 | </div> | 48 | </div> |
| 54 | </body> | 49 | </body> |
| 55 | </html> \ No newline at end of file | 50 | </html> \ No newline at end of file |