r66144 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r66143‎ | r66144 | r66145 >
Date:17:03, 10 May 2010
Author:tparscal
Status:resolved (Comments)
Tags:
Comment:
Resolves issues presented in r66029 as a response to bug #23428.
Modified paths:
  • /trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js (modified) (history)
  • /trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js (modified) (history)
  • /trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js (modified) (history)

Diff [purge]

Index: trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js
@@ -34,10 +34,12 @@
3535 .find( 'div.body' )
3636 .slideToggle( 'fast' );
3737 }
 38+ var $headings = $j( '#panel > div.portal > h5' );
 39+ var tabindex = 32767 - $headings.length;
3840 // Toggle the selected menu's class and expand or collapse the menu
39 - $j( '#panel > div.portal > h5' )
 41+ $headings
4042 // Make it keyboard accessible
41 - .attr( 'tabindex', 1 )
 43+ .each( function() { $j(this).attr( 'tabindex', tabindex++ ); } )
4244 // Make the space and enter keys act as a click
4345 .keydown( function( event ) {
4446 if ( event.which == 13 /* Enter */ || event.which == 32 /* Space */ ) {
Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js
@@ -34,10 +34,12 @@
3535 .find( 'div.body' )
3636 .slideToggle( 'fast' );
3737 }
 38+ var $headings = $j( '#panel > div.portal > h5' );
 39+ var tabindex = 32767 - $headings.length;
3840 // Toggle the selected menu's class and expand or collapse the menu
39 - $j( '#panel > div.portal > h5' )
 41+ $headings
4042 // Make it keyboard accessible
41 - .attr( 'tabindex', 1 )
 43+ .each( function() { $j(this).attr( 'tabindex', tabindex++ ); } )
4244 // Make the space and enter keys act as a click
4345 .keydown( function( event ) {
4446 if ( event.which == 13 /* Enter */ || event.which == 32 /* Space */ ) {
Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
@@ -1,7 +1,7 @@
22
33 $j(document).ready(function(){if(!wgVectorEnabledModules.collapsiblenav){return true;}
44 $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');}});function toggle($element){$j.cookie('vector-nav-'+$element.parent().attr('id'),$element.parent().is('.collapsed'));$element.parent().toggleClass('expanded').toggleClass('collapsed').find('div.body').slideToggle('fast');}
5 -$j('#panel > div.portal > h5').attr('tabindex',1).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;}
 5+var $headings=$j('#panel > div.portal > h5');var tabindex=32767-$headings.length;$headings.each(function(){$j(this).attr('tabindex',tabindex++);}).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;}
66 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')
77 $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)
88 $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;}

Follow-up revisions

RevisionCommit summaryAuthorDate
r66145Version bump for r66144.tparscal17:04, 10 May 2010
r66147Version bump for r66144.tparscal17:49, 10 May 2010
r661491.16wmf4: MFT r66034, r66144, r66145, r66147, r66148catrope18:10, 10 May 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r66029Added keyboard interaction to collapsible navigation. accessiblilty++;tparscal17:51, 7 May 2010

Comments

#Comment by Catrope (talk | contribs)   17:51, 10 May 2010
+	var tabindex = 32767 - $headings.length;

This will break $.wikiEditor.modules.dialogs.fn.setTabindexes() causing it to generate tabindexes higher than 32767, which are illegal. In fact, you should use this function here.

Status & tagging log