r67839 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r67838‎ | r67839 | r67840 >
Date:04:07, 11 June 2010
Author:adam
Status:ok (Comments)
Tags:
Comment:
Fix for bug 23541
Modified paths:
  • /trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/js/plugins.combined.js (modified) (history)
  • /trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js (modified) (history)
  • /trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js (modified) (history)

Diff [purge]

Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
@@ -71,13 +71,12 @@
7272 array( 'src' => 'js/plugins/jquery.color.js', 'version' => 1 ),
7373 array( 'src' => 'js/plugins/jquery.cookie.js', 'version' => 4 ),
7474 array( 'src' => 'js/plugins/jquery.delayedBind.js', 'version' => 1 ),
75 - array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 18 ),
7675 array( 'src' => 'js/plugins/jquery.expandableField.js', 'version' => 17 ),
7776 array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 22 ),
7877 array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 35 ),
7978 array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 193 ),
8079 array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 53 ),
81 - array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 66 ),
 80+ array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 67 ),
8281 array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 26 ),
8382 array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 98 ),
8483 array( 'src' => 'js/plugins/jquery.wikiEditor.preview.js', 'version' => 11 ),
@@ -89,10 +88,10 @@
9089 array( 'src' => 'js/thirdparty/contentCollector.js', 'version' => 2 ),
9190 ),
9291 'combined' => array(
93 - array( 'src' => 'js/plugins.combined.js', 'version' => 424 ),
 92+ array( 'src' => 'js/plugins.combined.js', 'version' => 425 ),
9493 ),
9594 'minified' => array(
96 - array( 'src' => 'js/plugins.combined.min.js', 'version' => 424 ),
 95+ array( 'src' => 'js/plugins.combined.min.js', 'version' => 425 ),
9796 ),
9897 ),
9998 );
Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js
@@ -599,7 +599,7 @@
600600 $sections
601601 .css( 'display', 'block' )
602602 .animate( { 'height': $section.outerHeight() }, $section.outerHeight() * 2, function() {
603 - $this.css( 'overflow', 'visible' ).css( 'height', 'auto' );
 603+ $( this ).css( 'overflow', 'visible' ).css( 'height', 'auto' );
604604 context.fn.trigger( 'resize' );
605605 } );
606606 }
Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js
@@ -11776,7 +11776,7 @@
1177711777 $sections
1177811778 .css( 'display', 'block' )
1177911779 .animate( { 'height': $section.outerHeight() }, $section.outerHeight() * 2, function() {
11780 - $this.css( 'overflow', 'visible' ).css( 'height', 'auto' );
 11780+ $( this ).css( 'overflow', 'visible' ).css( 'height', 'auto' );
1178111781 context.fn.trigger( 'resize' );
1178211782 } );
1178311783 }
Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
@@ -799,7 +799,7 @@
800800 $.wikiEditor.autoMsg(row[cell],['html','text'])+'</span></td>';}
801801 html+='</tr>';return html;},buildCharacter:function(character,actions){if(typeof character=='string'){character={'label':character,'action':{'type':'replace','options':{'peri':character}}};}else if(0 in character&&1 in character){character={'label':character[0],'action':{'type':'replace','options':{'peri':character[1]}}};}
802802 if('action'in character&&'label'in character){actions[character.label]=character.action;return'<span rel="'+character.label+'">'+character.label+'</span>';}},buildTab:function(context,id,section){var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');if(selected!=null){$.cookie('wikiEditor-'+context.instance+'-toolbar-section',selected,{expires:30,path:'/'});}
803 -return $('<span />').attr({'class':'tab tab-'+id,'rel':id}).append($('<a />').addClass(selected==id?'current':null).attr('href','#').text($.wikiEditor.autoMsg(section,'label')).data('context',context).mouseup(function(e){$(this).blur();}).mousedown(function(e){e.preventDefault();return false;}).click(function(e){var $sections=$(this).data('context').$ui.find('.sections');var $section=$(this).data('context').$ui.find('.section-'+$(this).parent().attr('rel'));var show=$section.css('display')=='none';$previousSections=$section.parent().find('.section-visible');$previousSections.css('position','absolute');$previousSections.removeClass('section-visible');$previousSections.fadeOut('fast',function(){$(this).css('position','relative');});$(this).parent().parent().find('a').removeClass('current');$sections.css('overflow','hidden');function animate($this){$sections.css('display','block').animate({'height':$section.outerHeight()},$section.outerHeight()*2,function(){$this.css('overflow','visible').css('height','auto');context.fn.trigger('resize');});}
 803+return $('<span />').attr({'class':'tab tab-'+id,'rel':id}).append($('<a />').addClass(selected==id?'current':null).attr('href','#').text($.wikiEditor.autoMsg(section,'label')).data('context',context).mouseup(function(e){$(this).blur();}).mousedown(function(e){e.preventDefault();return false;}).click(function(e){var $sections=$(this).data('context').$ui.find('.sections');var $section=$(this).data('context').$ui.find('.section-'+$(this).parent().attr('rel'));var show=$section.css('display')=='none';$previousSections=$section.parent().find('.section-visible');$previousSections.css('position','absolute');$previousSections.removeClass('section-visible');$previousSections.fadeOut('fast',function(){$(this).css('position','relative');});$(this).parent().parent().find('a').removeClass('current');$sections.css('overflow','hidden');function animate($this){$sections.css('display','block').animate({'height':$section.outerHeight()},$section.outerHeight()*2,function(){$(this).css('overflow','visible').css('height','auto');context.fn.trigger('resize');});}
804804 if(show){$section.addClass('section-visible');$section.fadeIn('fast');if($section.hasClass('loading')){$this=$(this);$this.addClass('current loading');setTimeout(function(){$section.trigger('loadSection');animate($(this));$this.removeClass('loading');},1000);}else{animate($(this));$(this).addClass('current');}}else{$sections.css('height',$section.outerHeight()).animate({'height':'hide'},$section.outerHeight()*2,function(){$(this).css({'overflow':'visible','height':0});context.fn.trigger('resize');});}
805805 if($.trackAction!=undefined){$.trackAction($section.attr('rel')+'.'+(show?'show':'hide'));}
806806 $.cookie('wikiEditor-'+$(this).data('context').instance+'-toolbar-section',show?$section.attr('rel'):null,{expires:30,path:'/'});e.preventDefault();return false;}));},buildSection:function(context,id,section){var $section=$('<div />').attr({'class':section.type+' section section-'+id,'rel':id});var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');var show=selected==id;if(typeof section.deferLoad!='undefined'&&section.deferLoad&&id!=='main'&&!show){$section.addClass('loading').append($('<div />').addClass('spinner'));$section.bind('loadSection',function(){$.wikiEditor.modules.toolbar.fn.reallyBuildSection(context,section,$section);$section.removeClass('loading');});}else{$.wikiEditor.modules.toolbar.fn.reallyBuildSection(context,section,$section);}

Follow-up revisions

RevisionCommit summaryAuthorDate
r680271.16wmf4: Merge Vector and UsabilityInitiative fixes from trunk: r67836, r678...catrope20:25, 14 June 2010

Comments

#Comment by Catrope (talk | contribs)   18:57, 11 June 2010
-				array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 18 ),

You're removing this line without putting it back anywhere else.

#Comment by Adammiller~mediawikiwiki (talk | contribs)   19:05, 11 June 2010

I removed it because it was listed twice. Pretty sure that's not necessary.

#Comment by Catrope (talk | contribs)   13:50, 12 June 2010

Ha, hadn't seen that, good catch.

Status & tagging log