diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/components/ui/tree-basic | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/components/ui/tree-basic')
| -rwxr-xr-x | js/components/ui/tree-basic/tree.reel/tree.html | 6 | ||||
| -rwxr-xr-x | js/components/ui/tree-basic/treeItem.reel/treeItem.html | 8 |
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">▶</span> | 27 | <span data-montage-id="treeArrow" class="treeArrow hidden">▶</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 |