aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/branch.reel/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/branch.reel/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/branch.reel/branch.html')
-rw-r--r--js/components/treeview/branch.reel/branch.html31
1 files changed, 12 insertions, 19 deletions
diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html
index b44a54c5..d3060d96 100644
--- a/js/components/treeview/branch.reel/branch.html
+++ b/js/components/treeview/branch.reel/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/branch.reel", 14 "prototype" : "js/components/treeview/branch.reel",
15 "name" : "Branch",
16 "properties" : { 15 "properties" : {
17 "element" : {"#" : "branch"}, 16 "element" : {"#" : "branch"},
18 "label" : { "@" : "textComponent" }, 17 "label" : { "@" : "textComponent" },
@@ -25,8 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
25 }, 24 },
26 25
27 "textComponent" : { 26 "textComponent" : {
28 "module" : "montage/ui/dynamic-text.reel", 27 "prototype" : "montage/ui/dynamic-text.reel",
29 "name" : "DynamicText",
30 "properties" : { 28 "properties" : {
31 "element" : { "#" : "label" } 29 "element" : { "#" : "label" }
32 }, 30 },
@@ -40,8 +38,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
40 }, 38 },
41 39
42 "arrayController": { 40 "arrayController": {
43 "module": "montage/ui/controller/array-controller", 41 "prototype": "montage/ui/controller/array-controller",
44 "name": "ArrayController",
45 "bindings": { 42 "bindings": {
46 "content": { 43 "content": {
47 "boundObject": {"@": "owner"}, 44 "boundObject": {"@": "owner"},
@@ -51,8 +48,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
51 }, 48 },
52 49
53 "leaf": { 50 "leaf": {
54 "module": "js/components/treeview/leaf.reel", 51 "prototype": "js/components/treeview/leaf.reel",
55 "name": "Leaf",
56 "bindings": { 52 "bindings": {
57 "sourceObject": { 53 "sourceObject": {
58 "boundObject": {"@": "repetition" }, 54 "boundObject": {"@": "repetition" },
@@ -78,8 +74,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
78 }, 74 },
79 75
80 "branch": { 76 "branch": {
81 "module": "js/components/treeview/branch.reel", 77 "prototype": "js/components/treeview/branch.reel",
82 "name": "Branch",
83 "bindings": { 78 "bindings": {
84 "sourceObject": { 79 "sourceObject": {
85 "boundObject": {"@": "repetition" }, 80 "boundObject": {"@": "repetition" },
@@ -105,8 +100,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
105 }, 100 },
106 101
107 "repetition": { 102 "repetition": {
108 "module": "montage/ui/repetition.reel", 103 "prototype": "montage/ui/repetition.reel",
109 "name": "Repetition",
110 "properties": { 104 "properties": {
111 "element": { "#": "branchList" }, 105 "element": { "#": "branchList" },
112 "contentController": {"@": "arrayController" } 106 "contentController": {"@": "arrayController" }
@@ -114,8 +108,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
114 }, 108 },
115 109
116 "substitution": { 110 "substitution": {
117 "module": "montage/ui/substitution.reel", 111 "prototype": "montage/ui/substitution.reel",
118 "name": "Substitution",
119 "properties": { 112 "properties": {
120 "element": {"#": "treeItem"}, 113 "element": {"#": "treeItem"},
121 "switchComponents": { 114 "switchComponents": {
@@ -136,11 +129,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
136 </script> 129 </script>
137</head> 130</head>
138<body> 131<body>
139 <div id="branch" class="branch"> 132 <div data-montage-id="branch" class="branch">
140 <span id="label" class="branch-label"></span> 133 <span data-montage-id="label" class="branch-label"></span>
141 134
142 <ul id="branchList"> 135 <ul data-montage-id="branchList">
143 <li id="treeItem"></li> 136 <li data-montage-id="treeItem"></li>
144 </ul> 137 </ul>
145 </div> 138 </div>
146</body> 139</body>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 07:31:56 +0000