| Index: trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js |
| — | — | @@ -25,14 +25,23 @@ |
| 26 | 26 | } |
| 27 | 27 | } ); |
| 28 | 28 | // Toggle the selected menu's class and expand or collapse the menu |
| 29 | | - $j( '#panel > div.portal > h5' ).click( function() { |
| 30 | | - $j.cookie( 'vector-nav-' + $j(this).parent().attr( 'id' ), $j(this).parent().is( '.collapsed' ) ); |
| 31 | | - $j(this) |
| 32 | | - .parent() |
| 33 | | - .toggleClass( 'expanded' ) |
| 34 | | - .toggleClass( 'collapsed' ) |
| 35 | | - .find( 'div.body' ) |
| 36 | | - .slideToggle( 'fast' ); |
| 37 | | - return false; |
| 38 | | - } ); |
| | 29 | + $j( '#panel > div.portal > h5' ) |
| | 30 | + // Make it keyboard accessible |
| | 31 | + .attr( 'tabindex', 1 ) |
| | 32 | + // Make the space and enter keys act as a click |
| | 33 | + .keydown( function( event ) { |
| | 34 | + if ( event.which == 13 /* Enter */ || event.which == 32 /* Space */ ) { |
| | 35 | + $j(this).click(); |
| | 36 | + } |
| | 37 | + } ) |
| | 38 | + .click( function() { |
| | 39 | + $j.cookie( 'vector-nav-' + $j(this).parent().attr( 'id' ), $j(this).parent().is( '.collapsed' ) ); |
| | 40 | + $j(this) |
| | 41 | + .parent() |
| | 42 | + .toggleClass( 'expanded' ) |
| | 43 | + .toggleClass( 'collapsed' ) |
| | 44 | + .find( 'div.body' ) |
| | 45 | + .slideToggle( 'fast' ); |
| | 46 | + return false; |
| | 47 | + } ); |
| 39 | 48 | } ); |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php |
| — | — | @@ -12,7 +12,7 @@ |
| 13 | 13 | |
| 14 | 14 | static $scripts = array( |
| 15 | 15 | 'raw' => array( |
| 16 | | - array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 8 ), |
| | 16 | + array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 9 ), |
| 17 | 17 | array( 'src' => 'Modules/CollapsibleTabs/CollapsibleTabs.js', 'version' => 8 ), |
| 18 | 18 | array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 8 ), |
| 19 | 19 | array( 'src' => 'Modules/FooterCleanup/FooterCleanup.js', 'version' => 5 ), |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js |
| — | — | @@ -25,16 +25,25 @@ |
| 26 | 26 | } |
| 27 | 27 | } ); |
| 28 | 28 | // Toggle the selected menu's class and expand or collapse the menu |
| 29 | | - $j( '#panel > div.portal > h5' ).click( function() { |
| 30 | | - $j.cookie( 'vector-nav-' + $j(this).parent().attr( 'id' ), $j(this).parent().is( '.collapsed' ) ); |
| 31 | | - $j(this) |
| 32 | | - .parent() |
| 33 | | - .toggleClass( 'expanded' ) |
| 34 | | - .toggleClass( 'collapsed' ) |
| 35 | | - .find( 'div.body' ) |
| 36 | | - .slideToggle( 'fast' ); |
| 37 | | - return false; |
| 38 | | - } ); |
| | 29 | + $j( '#panel > div.portal > h5' ) |
| | 30 | + // Make it keyboard accessible |
| | 31 | + .attr( 'tabindex', 1 ) |
| | 32 | + // Make the space and enter keys act as a click |
| | 33 | + .keydown( function( event ) { |
| | 34 | + if ( event.which == 13 /* Enter */ || event.which == 32 /* Space */ ) { |
| | 35 | + $j(this).click(); |
| | 36 | + } |
| | 37 | + } ) |
| | 38 | + .click( function() { |
| | 39 | + $j.cookie( 'vector-nav-' + $j(this).parent().attr( 'id' ), $j(this).parent().is( '.collapsed' ) ); |
| | 40 | + $j(this) |
| | 41 | + .parent() |
| | 42 | + .toggleClass( 'expanded' ) |
| | 43 | + .toggleClass( 'collapsed' ) |
| | 44 | + .find( 'div.body' ) |
| | 45 | + .slideToggle( 'fast' ); |
| | 46 | + return false; |
| | 47 | + } ); |
| 39 | 48 | } ); |
| 40 | 49 | $j(document).ready( function() { |
| 41 | 50 | // Check if CollapsibleTabs is enabled |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | |
| 3 | 3 | $j(document).ready(function(){if(!wgVectorEnabledModules.collapsiblenav){return true;} |
| 4 | | -$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');}});$j('#panel > div.portal > h5').click(function(){$j.cookie('vector-nav-'+$j(this).parent().attr('id'),$j(this).parent().is('.collapsed'));$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');return false;});});$j(document).ready(function(){if(!wgVectorEnabledModules.collapsibletabs){return true;} |
| | 4 | +$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');}});$j('#panel > div.portal > h5').attr('tabindex',1).keydown(function(event){if(event.which==13||event.which==32){$j(this).click();}}).click(function(){$j.cookie('vector-nav-'+$j(this).parent().attr('id'),$j(this).parent().is('.collapsed'));$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');return false;});});$j(document).ready(function(){if(!wgVectorEnabledModules.collapsibletabs){return true;} |
| 5 | 5 | var rtl=$j('body').is('.rtl');$j.collapsibleTabs.moveToCollapsed=function(ele){var $moving=$j(ele);$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=true;var data=$j.collapsibleTabs.getSettings($moving);var target=data.collapsedContainer;$moving.css("position","relative").css((rtl?'left':'right'),0).animate({width:'1px'},"normal",function(){$j(this).hide();$j('<span class="placeholder" style="display:none;"></span>').insertAfter(this);$j(this).remove().prependTo(target).data('collapsibleTabsSettings',data);$j(this).attr('style','display:list-item;');$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($j(ele)).expandedContainer)).shifting=false;$j.collapsibleTabs.handleResize();});};$j.collapsibleTabs.moveToExpanded=function(ele){var $moving=$j(ele);$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=true;var data=$j.collapsibleTabs.getSettings($moving);var $target=$j(data.expandedContainer).find('span.placeholder:first');var expandedWidth=data.expandedWidth;$moving.css("position","relative").css((rtl?'right':'left'),0).css('width','1px');$target.replaceWith($moving.remove().css('width','1px').data('collapsibleTabsSettings',data).animate({width:expandedWidth+"px"},"normal",function(){$j(this).attr('style','display:block;');$j.collapsibleTabs.getSettings($j($j.collapsibleTabs.getSettings($moving).expandedContainer)).shifting=false;$j.collapsibleTabs.handleResize();}));};$j('#p-views ul').bind("beforeTabCollapse",function(){if($j('#p-cactions').css('display')=='none') |
| 6 | 6 | $j("#p-cactions").addClass("filledPortlet").removeClass("emptyPortlet").find('h5').css('width','1px').animate({'width':'26px'},390);}).bind("beforeTabExpand",function(){if($j('#p-cactions li').length==1) |
| 7 | 7 | $j("#p-cactions h5").animate({'width':'1px'},370,function(){$j(this).attr('style','').parent().addClass("emptyPortlet").removeClass("filledPortlet");});}).collapsibleTabs({expandCondition:function(eleWidth){if(rtl){return($j('#right-navigation').position().left+$j('#right-navigation').width()+1)<($j('#left-navigation').position().left-eleWidth);}else{return($j('#left-navigation').position().left+$j('#left-navigation').width()+1)<($j('#right-navigation').position().left-eleWidth);}},collapseCondition:function(){if(rtl){return($j('#right-navigation').position().left+$j('#right-navigation').width())>$j('#left-navigation').position().left;}else{return($j('#left-navigation').position().left+$j('#left-navigation').width())>$j('#right-navigation').position().left;}}});});$j(document).ready(function(){if(!wgVectorEnabledModules.editwarning||$j('#wpTextbox1').size()==0){return true;} |