From: <rob...@us...> - 2012-10-12 17:12:19
|
Revision: 43419 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43419&view=rev Author: robertplummer Date: 2012-10-12 17:12:12 +0000 (Fri, 12 Oct 2012) Log Message: ----------- [ENH] Return expanding images from parsed expression rather than dynamically inserted with javascript [FIX] Give only expandable items an expandable icon [FIX] Updated test to reflect changes Modified Paths: -------------- trunk/lib/core/WikiPlugin/expandingoutline/list.php trunk/lib/core/WikiPlugin/expandingoutline.php trunk/lib/test/core/JisonParser/PluginTest.php Modified: trunk/lib/core/WikiPlugin/expandingoutline/list.php =================================================================== --- trunk/lib/core/WikiPlugin/expandingoutline/list.php 2012-10-12 17:02:47 UTC (rev 43418) +++ trunk/lib/core/WikiPlugin/expandingoutline/list.php 2012-10-12 17:12:12 UTC (rev 43419) @@ -77,7 +77,10 @@ '<td>' . '<table>' . '<tr>' . - '<td id="" class="' . $class . ' tier' . $tier . '" data-trail="' . $trail . '" style="width:' . ((count($this->labelTracker) * 30) + 30) . 'px; text-align: right;">' . $label . '</td>' . + '<td id="" class="' . $class . ' tier' . $tier . '" data-trail="' . $trail . '" style="width:' . ((count($this->labelTracker) * 30) + 30) . 'px; text-align: right;">' . + $label . + (empty($list['children']) == false ? '<img class="listImg" src="img/toggle-expand-dark.png" data-altImg="img/toggle-collapse-dark.png" />' : ''). + '</td>' . '<td class="tikiListTableItem">' . $list['content'] .'</td>' . '</tr>'; Modified: trunk/lib/core/WikiPlugin/expandingoutline.php =================================================================== --- trunk/lib/core/WikiPlugin/expandingoutline.php 2012-10-12 17:02:47 UTC (rev 43418) +++ trunk/lib/core/WikiPlugin/expandingoutline.php 2012-10-12 17:12:12 UTC (rev 43419) @@ -37,6 +37,14 @@ var labels = base.find('td.tikiListTableLabel'); + function switchImg(img) { + var newImg = img.data('altImg'); + var oldImg = img.attr('src'); + img + .attr('src', newImg) + .data('altIm', oldImg); + } + labels .toggle(function(e) { if (e.shiftKey) { @@ -47,8 +55,7 @@ var child = base.find('.parentTrail' + $(this).data('trail')); if (child.stop().fadeIn().length) { - $(this).find('img.listImg').attr('src', 'img/toggle-collapse-dark.png'); - + switchImg($(this).find('img.listImg')); } }, function(e) { if (e.shiftKey) { @@ -59,11 +66,9 @@ var child = base.find('.parentTrail' + $(this).data('trail')); if (child.stop().fadeOut().length) { - $(this).find('img.listImg').attr('src', 'img/toggle-expand-dark.png'); + switchImg($(this).find('img.listImg')); } }); - - base.find('td.tikiListTableLabel').prepend('<img class="listImg" src="img/toggle-expand-dark.png" />'); })(); JQ ); Modified: trunk/lib/test/core/JisonParser/PluginTest.php =================================================================== --- trunk/lib/test/core/JisonParser/PluginTest.php 2012-10-12 17:02:47 UTC (rev 43418) +++ trunk/lib/test/core/JisonParser/PluginTest.php 2012-10-12 17:12:12 UTC (rev 43419) @@ -157,7 +157,7 @@ '<td>' . '<table>' . '<tr>' . - '<td id="" class="tikiListTableLabel tier0" data-trail="2" style="width:60px; text-align: right;">2</td>' . + '<td id="" class="tikiListTableLabel tier0" data-trail="2" style="width:60px; text-align: right;">2<img class="listImg" src="img/toggle-expand-dark.png" data-altImg="img/toggle-collapse-dark.png" /></td>' . '<td class="tikiListTableItem">test</td>' . '</tr>' . '<tr class="parentTrail2 tikiListTableChild">' . @@ -187,7 +187,7 @@ '<td>' . '<table>' . '<tr>' . - '<td id="" class="tikiListTableLabel tier1" data-trail="2_3" style="width:90px; text-align: right;">2.3</td>'. + '<td id="" class="tikiListTableLabel tier1" data-trail="2_3" style="width:90px; text-align: right;">2.3<img class="listImg" src="img/toggle-expand-dark.png" data-altImg="img/toggle-collapse-dark.png" /></td>'. '<td class="tikiListTableItem">test</td>' . '</tr>' . '<tr class="parentTrail2_3 tikiListTableChild">' . @@ -197,7 +197,7 @@ '<td>' . '<table>'. '<tr>' . - '<td id="" class="tikiListTableLabel tier2" data-trail="2_3_1" style="width:120px; text-align: right;">2.3.1</td>'. + '<td id="" class="tikiListTableLabel tier2" data-trail="2_3_1" style="width:120px; text-align: right;">2.3.1<img class="listImg" src="img/toggle-expand-dark.png" data-altImg="img/toggle-collapse-dark.png" /></td>'. '<td class="tikiListTableItem">test</td>' . '</tr>' . '<tr class="parentTrail2_3_1 tikiListTableChild">'. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |