| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | $j( '#panel > div.portal:not(:first)' ) |
| 42 | 42 | .each( function( i ) { |
| 43 | 43 | var state = $j.cookie( 'vector-nav-' + $j(this).attr( 'id' ) ); |
| 44 | | - if ( state == 'true' || ( state == null && i < 1 ) ) { |
| | 44 | + if ( state == 'true' || ( state == null && (i < 1 || ( $j(this).attr( 'id' ) == 'p-lang' ) ) ) ) { |
| 45 | 45 | $j(this) |
| 46 | 46 | .addClass( 'expanded' ) |
| 47 | 47 | .find( 'div.body' ) |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.js |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | $j( '#panel > div.portal:not(:first)' ) |
| 42 | 42 | .each( function( i ) { |
| 43 | 43 | var state = $j.cookie( 'vector-nav-' + $j(this).attr( 'id' ) ); |
| 44 | | - if ( state == 'true' || ( state == null && i < 1 ) ) { |
| | 44 | + if ( state == 'true' || ( state == null && (i < 1 || ( $j(this).attr( 'id' ) == 'p-lang' ) ) ) ) { |
| 45 | 45 | $j(this) |
| 46 | 46 | .addClass( 'expanded' ) |
| 47 | 47 | .find( 'div.body' ) |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/Vector/Vector.combined.min.js |
| — | — | @@ -1,7 +1,7 @@ |
| 2 | 2 | |
| 3 | 3 | $j(document).ready(function(){if(!wgVectorEnabledModules.collapsiblenav){return true;} |
| 4 | 4 | var mod={'browsers':{'ltr':{'opera':[['>=',9.6]],'konqueror':[['>=',4.0]],'blackberry':false,'ipod':false,'iphone':false},'rtl':{'opera':[['>=',9.6]],'konqueror':[['>=',4.0]],'blackberry':false,'ipod':false,'iphone':false}}};if(!$j.wikiEditor.isSupported(mod)){return true;} |
| 5 | | -$j('#panel').addClass('collapsible-nav');$j('#panel > div.portal:first').addClass('expanded').find('div.body').show();$j('#panel > div.portal:not(:first)').each(function(i){var state=$j.cookie('vector-nav-'+$j(this).attr('id'));if(state=='true'||(state==null&&i<1)){$j(this).addClass('expanded').find('div.body').show();}else{$j(this).addClass('collapsed');} |
| | 5 | +$j('#panel').addClass('collapsible-nav');$j('#panel > div.portal:first').addClass('expanded').find('div.body').show();$j('#panel > div.portal:not(:first)').each(function(i){var state=$j.cookie('vector-nav-'+$j(this).attr('id'));if(state=='true'||(state==null&&(i<1||($j(this).attr('id')=='p-lang')))){$j(this).addClass('expanded').find('div.body').show();}else{$j(this).addClass('collapsed');} |
| 6 | 6 | if(state!=null){$j.cookie('vector-nav-'+$j(this).attr('id'),state,{expires:30,path:'/'});}});function toggle($element){$j.cookie('vector-nav-'+$element.parent().attr('id'),$element.parent().is('.collapsed'),{expires:30,path:'/'});$element.parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');} |
| 7 | 7 | var $headings=$j('#panel > div.portal > h5');var maxTI=0;$j('[tabindex]').each(function(){var ti=parseInt($j(this).attr('tabindex'));if(ti>maxTI) |
| 8 | 8 | maxTI=ti;});var tabIndex=maxTI+1;$j('#searchInput').attr('tabindex',tabIndex++);$headings.each(function(){$j(this).attr('tabindex',tabIndex++);});$headings.keydown(function(event){if(event.which==13||event.which==32){toggle($j(this));}}).mousedown(function(){toggle($j(this));$j(this).blur();return false;});});$j(document).ready(function(){if(!wgVectorEnabledModules.collapsibletabs){return true;} |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 9 | 9 | Merged /trunk/extensions/UsabilityInitiative:r67281 |