aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/tree-basic
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /js/components/ui/tree-basic
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/ui/tree-basic')
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html6
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html8
2 files changed, 7 insertions, 7 deletions
diff --git a/js/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html
index f0c51fcc..1144b563 100755
--- a/js/components/ui/tree-basic/tree.reel/tree.html
+++ b/js/components/ui/tree-basic/tree.reel/tree.html
@@ -65,9 +65,9 @@
65 </script> 65 </script>
66</head> 66</head>
67<body> 67<body>
68<div id="atree" class="atree"> 68<div data-montage-id="atree" class="atree">
69 <ul id="treeView" style="display:block;"> 69 <ul data-montage-id="treeView" style="display:block;">
70 <li id="treeItem"></li> 70 <li data-montage-id="treeItem"></li>
71 </ul> 71 </ul>
72</div> 72</div>
73</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 9b8cb1ea..c5cdc533 100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.html
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.html
@@ -23,12 +23,12 @@
23 </script> 23 </script>
24</head> 24</head>
25<body> 25<body>
26<li id="atreeItem" class="atreeItem"> 26<li data-montage-id="atreeItem" class="atreeItem">
27 <span id="treeArrow" class="treeArrow hidden">&#9654;</span> 27 <span data-montage-id="treeArrow" class="treeArrow hidden">&#9654;</span>
28 <div class="atreeItemContent atreeItemImgContainer" > 28 <div class="atreeItemContent atreeItemImgContainer" >
29 <img id="atreeItemImg" class="atreeItemImg" src="" /> 29 <img data-montage-id="atreeItemImg" class="atreeItemImg" src="" />
30 </div> 30 </div>
31 <span id="name" class="atreeItemContent name"></span> 31 <span data-montage-id="name" class="atreeItemContent name"></span>
32</li> 32</li>
33</body> 33</body>
34</html> \ No newline at end of file 34</html> \ No newline at end of file