aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/leaf.reel/leaf.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/leaf.reel/leaf.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/leaf.reel/leaf.html')
-rw-r--r--js/components/treeview/leaf.reel/leaf.html12
1 files changed, 5 insertions, 7 deletions
diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html
index cf0b4e40..a644d4f9 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>
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,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 },
@@ -36,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
36 </script> 34 </script>
37</head> 35</head>
38<body> 36<body>
39 <div id="leaf" class="leaf"> 37 <div data-montage-id="leaf" class="leaf">
40 <span id="label" class="leaf-label"></span> 38 <span data-montage-id="label" class="leaf-label"></span>
41 </div> 39 </div>
42</body> 40</body>
43</html> \ No newline at end of file 41</html> \ No newline at end of file