From: <jon...@us...> - 2011-02-20 15:26:24
|
Revision: 32936 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32936&view=rev Author: jonnybradley Date: 2011-02-20 15:26:18 +0000 (Sun, 20 Feb 2011) Log Message: ----------- [FIX] tabs: Only de-active first set of tabs on click, and remove superfluous tabinactive class Modified Paths: -------------- trunk/lib/smarty_tiki/block.tabset.php trunk/lib/tiki-js.js Modified: trunk/lib/smarty_tiki/block.tabset.php =================================================================== --- trunk/lib/smarty_tiki/block.tabset.php 2011-02-20 15:22:42 UTC (rev 32935) +++ trunk/lib/smarty_tiki/block.tabset.php 2011-02-20 15:26:18 UTC (rev 32936) @@ -109,7 +109,7 @@ } $ret .= '<div class="container' . $content_class . '"'. $mobile_div_data.'>'; foreach ($smarty_tabset[$tabset_index]['tabs'] as $value) { - $ret .= '<span class="tabmark tab'.$count.' '.($count == $cookietab ? 'tabactive' : 'tabinactive').'">'. + $ret .= '<span class="tabmark tab'.$count.' '.($count == $cookietab ? 'tabactive' : '').'">'. '<a href="#' . ( empty($mobile_a_data) ? 'content'.$count.'"' : '"' ) . ' onclick="tikitabs('.$count.',this); return false;"'.$mobile_a_data.'>'.$value.'</a></span>'; ++$count; Modified: trunk/lib/tiki-js.js =================================================================== --- trunk/lib/tiki-js.js 2011-02-20 15:22:42 UTC (rev 32935) +++ trunk/lib/tiki-js.js 2011-02-20 15:26:18 UTC (rev 32936) @@ -659,8 +659,8 @@ container = $(tabElement).parents(".tabs:first").parent(); } - $(".tabmark:not(.tab" + focus + ":first)", container).removeClass("tabactive"); // may need .addClass("tabinactive"); - $(".tabmark.tab" + focus + ":first", container).addClass("tabactive"); // and .removeClass("tabinactive"); + $("> .tabs .tabmark:not(.tab" + focus + ":first)", container).removeClass("tabactive"); // may need .addClass("tabinactive"); + $("> .tabs .tabmark.tab" + focus + ":first", container).addClass("tabactive"); // and .removeClass("tabinactive"); $("> .tabcontent:not(.content" + focus + ":first)", container).hide(); $("> .tabcontent.content" + focus + ":first", container).show(); setCookie( $(".tabs:first", container).data("name"), focus, "tabs", "session"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |