diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/ui/tree-basic/treeItem.reel | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/components/ui/tree-basic/treeItem.reel')
| -rwxr-xr-x | js/components/ui/tree-basic/treeItem.reel/treeItem.html | 8 |
1 files changed, 4 insertions, 4 deletions
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 |