aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/tree-basic
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/ui/tree-basic
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/ui/tree-basic')
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html17
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html13
2 files changed, 13 insertions, 17 deletions
diff --git a/js/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html
index 1990a4ef..1144b563 100755
--- a/js/components/ui/tree-basic/tree.reel/tree.html
+++ b/js/components/ui/tree-basic/tree.reel/tree.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 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "treeItem": { 13 "treeItem": {
14 "module" : "js/components/ui/tree-basic/treeItem.reel", 14 "prototype" : "js/components/ui/tree-basic/treeItem.reel",
15 "name": "TreeItem",
16 "properties": { 15 "properties": {
17 "element": {"#": "treeItem"} 16 "element": {"#": "treeItem"}
18 }, 17 },
@@ -41,8 +40,7 @@
41 }, 40 },
42 41
43 "repetition1" : { 42 "repetition1" : {
44 "module": "montage/ui/repetition.reel", 43 "prototype": "montage/ui/repetition.reel",
45 "name": "Repetition",
46 "properties": { 44 "properties": {
47 "element": {"#": "treeView"} 45 "element": {"#": "treeView"}
48 }, 46 },
@@ -56,8 +54,7 @@
56 }, 54 },
57 55
58 "owner":{ 56 "owner":{
59 "module": "js/components/ui/tree-basic/tree.reel", 57 "prototype": "js/components/ui/tree-basic/tree.reel",
60 "name": "Tree",
61 "properties" : { 58 "properties" : {
62 "element": {"#": "atree"}, 59 "element": {"#": "atree"},
63 "components": [{"@": "repetition1"}] 60 "components": [{"@": "repetition1"}]
@@ -68,9 +65,9 @@
68 </script> 65 </script>
69</head> 66</head>
70<body> 67<body>
71<div id="atree" class="atree"> 68<div data-montage-id="atree" class="atree">
72 <ul id="treeView" style="display:block;"> 69 <ul data-montage-id="treeView" style="display:block;">
73 <li id="treeItem"></li> 70 <li data-montage-id="treeItem"></li>
74 </ul> 71 </ul>
75</div> 72</div>
76</body> 73</body>
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.html b/js/components/ui/tree-basic/treeItem.reel/treeItem.html
index 3c5b19a9..c5cdc533 100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.html
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.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 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner":{ 13 "owner":{
14 "module": "js/components/ui/tree-basic/tree.reel", 14 "prototype": "js/components/ui/tree-basic/tree.reel[TreeItem]",
15 "name": "TreeItem",
16 "properties": { 15 "properties": {
17 "element" : {"#": "atreeItem"}, 16 "element" : {"#": "atreeItem"},
18 "itemName": {"#": "name"}, 17 "itemName": {"#": "name"},
@@ -24,12 +23,12 @@
24 </script> 23 </script>
25</head> 24</head>
26<body> 25<body>
27<li id="atreeItem" class="atreeItem"> 26<li data-montage-id="atreeItem" class="atreeItem">
28 <span id="treeArrow" class="treeArrow hidden">&#9654;</span> 27 <span data-montage-id="treeArrow" class="treeArrow hidden">&#9654;</span>
29 <div class="atreeItemContent atreeItemImgContainer" > 28 <div class="atreeItemContent atreeItemImgContainer" >
30 <img id="atreeItemImg" class="atreeItemImg" src="" /> 29 <img data-montage-id="atreeItemImg" class="atreeItemImg" src="" />
31 </div> 30 </div>
32 <span id="name" class="atreeItemContent name"></span> 31 <span data-montage-id="name" class="atreeItemContent name"></span>
33</li> 32</li>
34</body> 33</body>
35</html> \ No newline at end of file 34</html> \ No newline at end of file