aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/ninja-branch.reel/ninja-branch.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/treeview/ninja-branch.reel/ninja-branch.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-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/ninja-branch.reel/ninja-branch.html')
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html33
1 files changed, 13 insertions, 20 deletions
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html
index 13f1c575..60894fbc 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.html
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.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/ninja-branch.reel", 14 "prototype" : "js/components/treeview/ninja-branch.reel[Branch]",
15 "name" : "Branch",
16 "properties" : { 15 "properties" : {
17 "element" : {"#" : "branch"}, 16 "element" : {"#" : "branch"},
18 "label" : { "@" : "textComponent" }, 17 "label" : { "@" : "textComponent" },
@@ -26,8 +25,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
26 }, 25 },
27 26
28 "textComponent" : { 27 "textComponent" : {
29 "module" : "montage/ui/dynamic-text.reel", 28 "prototype" : "montage/ui/dynamic-text.reel",
30 "name" : "DynamicText",
31 "properties" : { 29 "properties" : {
32 "element" : { "#" : "label" } 30 "element" : { "#" : "label" }
33 }, 31 },
@@ -41,8 +39,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
41 }, 39 },
42 40
43 "arrayController": { 41 "arrayController": {
44 "module": "montage/ui/controller/array-controller", 42 "prototype": "montage/ui/controller/array-controller",
45 "name": "ArrayController",
46 "bindings": { 43 "bindings": {
47 "content": { 44 "content": {
48 "boundObject": {"@": "owner"}, 45 "boundObject": {"@": "owner"},
@@ -52,8 +49,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
52 }, 49 },
53 50
54 "leaf": { 51 "leaf": {
55 "module": "js/components/treeview/ninja-leaf.reel", 52 "prototype": "js/components/treeview/ninja-leaf.reel[Leaf]",
56 "name": "Leaf",
57 "bindings": { 53 "bindings": {
58 "sourceObject": { 54 "sourceObject": {
59 "boundObject": {"@": "repetition" }, 55 "boundObject": {"@": "repetition" },
@@ -79,8 +75,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
79 }, 75 },
80 76
81 "branch": { 77 "branch": {
82 "module": "js/components/treeview/ninja-branch.reel", 78 "prototype": "js/components/treeview/ninja-branch.reel[Branch]",
83 "name": "Branch",
84 "bindings": { 79 "bindings": {
85 "sourceObject": { 80 "sourceObject": {
86 "boundObject": {"@": "repetition" }, 81 "boundObject": {"@": "repetition" },
@@ -106,8 +101,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
106 }, 101 },
107 102
108 "repetition": { 103 "repetition": {
109 "module": "montage/ui/repetition.reel", 104 "prototype": "montage/ui/repetition.reel",
110 "name": "Repetition",
111 "properties": { 105 "properties": {
112 "element": { "#": "branchList" }, 106 "element": { "#": "branchList" },
113 "contentController": {"@": "arrayController" }, 107 "contentController": {"@": "arrayController" },
@@ -116,8 +110,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
116 }, 110 },
117 111
118 "substitution": { 112 "substitution": {
119 "module": "montage/ui/substitution.reel", 113 "prototype": "montage/ui/substitution.reel",
120 "name": "Substitution",
121 "properties": { 114 "properties": {
122 "element": {"#": "treeItem"}, 115 "element": {"#": "treeItem"},
123 "switchComponents": { 116 "switchComponents": {
@@ -138,11 +131,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
138 </script> 131 </script>
139</head> 132</head>
140<body> 133<body>
141 <div id="branch" class="branch"> 134 <div data-montage-id="branch" class="branch">
142 <div id="label" class="branch-label"></div> 135 <div data-montage-id="label" class="branch-label"></div>
143 <div id="branchCollapser" class="branchCollapser"> 136 <div data-montage-id="branchCollapser" class="branchCollapser">
144 <ul id="branchList"> 137 <ul data-montage-id="branchList">
145 <li id="treeItem"></li> 138 <li data-montage-id="treeItem"></li>
146 </ul> 139 </ul>
147 </div> 140 </div>
148 141