http://www.mediawiki.org/wiki/Special:Code/MediaWiki/58975
Revision: 58975 Author: catrope Date: 2009-11-12 21:43:00 +0000 (Thu, 12 Nov 2009) Log Message: ----------- usability: Merge r58973, r58974 from trunk into acaifix Modified Paths: -------------- branches/usability/acaifix/UsabilityInitiative.hooks.php branches/usability/acaifix/js/plugins/jquery.wikiEditor.toolbar.js branches/usability/acaifix/js/plugins.combined.js branches/usability/acaifix/js/plugins.combined.min.js Property Changed: ---------------- branches/usability/acaifix/ branches/usability/acaifix/CollapsibleTabs/CollapsibleTabs.js branches/usability/acaifix/EditToolbar/EditToolbar.js branches/usability/acaifix/OptIn/SpecialOptIn.php branches/usability/acaifix/js/plugins/jquery.wikiEditor.toolbar.js Property changes on: branches/usability/acaifix ___________________________________________________________________ Modified: svn:mergeinfo - /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 /trunk/extensions/UsabilityInitiative:56151-57234,58926 /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 + /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 /trunk/extensions/UsabilityInitiative:56151-57234,58926,58973-58974 /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 Property changes on: branches/usability/acaifix/CollapsibleTabs/CollapsibleTabs.js ___________________________________________________________________ Modified: svn:mergeinfo - /branches/REL1_15/phase3/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:51646 /trunk/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:56151-57234,58926 /trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleTabs/CollapsibleTabs.js:58969 /trunk/phase3/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 + /branches/REL1_15/phase3/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:51646 /trunk/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:56151-57234,58926,58973-58974 /trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleTabs/CollapsibleTabs.js:58969 /trunk/phase3/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 Property changes on: branches/usability/acaifix/EditToolbar/EditToolbar.js ___________________________________________________________________ Modified: svn:mergeinfo - /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646 /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56151-57234,58926 /trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js:58873,58923,58953 /trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 + /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646 /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56151-57234,58926,58973-58974 /trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js:58873,58923,58953 /trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 Property changes on: branches/usability/acaifix/OptIn/SpecialOptIn.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:51646 /trunk/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56151-57234,57956,58926 /trunk/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 + /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:51646 /trunk/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56151-57234,57956,58926,58973-58974 /trunk/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 Modified: branches/usability/acaifix/UsabilityInitiative.hooks.php =================================================================== --- branches/usability/acaifix/UsabilityInitiative.hooks.php 2009-11-12 21:40:34 UTC (rev 58974) +++ branches/usability/acaifix/UsabilityInitiative.hooks.php 2009-11-12 21:43:00 UTC (rev 58975) @@ -67,15 +67,15 @@ array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 6 ), array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 17 ), array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 12 ), - array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 21 ), + array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 22 ), array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 8 ), array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 27 ), ), 'combined' => array( - array( 'src' => 'js/plugins.combined.js', 'version' => 63 ), + array( 'src' => 'js/plugins.combined.js', 'version' => 64 ), ), 'minified' => array( - array( 'src' => 'js/plugins.combined.min.js', 'version' => 63 ), + array( 'src' => 'js/plugins.combined.min.js', 'version' => 64 ), ), ), ); Modified: branches/usability/acaifix/js/plugins/jquery.wikiEditor.toolbar.js =================================================================== --- branches/usability/acaifix/js/plugins/jquery.wikiEditor.toolbar.js 2009-11-12 21:40:34 UTC (rev 58974) +++ branches/usability/acaifix/js/plugins/jquery.wikiEditor.toolbar.js 2009-11-12 21:43:00 UTC (rev 58975) @@ -471,7 +471,7 @@ // This is a terrible hack: IE and Safari use a 1/2/4 bitmask, // but Firefox uses 0/1/2 // See http://quirksmode.org/dom/w3c_events.html#miscprop - if ( e.button !== 0 || e.button & 1 == 0) { + if ( e.button !== 0 && ( e.button & 1 ) == 0) { return true; } var $sections = $(this).data( 'context' ).$ui.find( '.sections' ); Property changes on: branches/usability/acaifix/js/plugins/jquery.wikiEditor.toolbar.js ___________________________________________________________________ Modified: svn:mergeinfo - /branches/REL1_15/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:51646 /trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:56151-57234,57443,58923,58926,58953 /trunk/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 + /branches/REL1_15/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:51646 /trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:56151-57234,57443,58923,58926,58953,58973-58974 /trunk/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 Modified: branches/usability/acaifix/js/plugins.combined.js =================================================================== --- branches/usability/acaifix/js/plugins.combined.js 2009-11-12 21:40:34 UTC (rev 58974) +++ branches/usability/acaifix/js/plugins.combined.js 2009-11-12 21:43:00 UTC (rev 58975) @@ -2003,7 +2003,7 @@ // This is a terrible hack: IE and Safari use a 1/2/4 bitmask, // but Firefox uses 0/1/2 // See http://quirksmode.org/dom/w3c_events.html#miscprop - if ( e.button !== 0 || e.button & 1 == 0) { + if ( e.button !== 0 && ( e.button & 1 ) == 0) { return true; } var $sections = $(this).data( 'context' ).$ui.find( '.sections' ); Modified: branches/usability/acaifix/js/plugins.combined.min.js =================================================================== --- branches/usability/acaifix/js/plugins.combined.min.js 2009-11-12 21:40:34 UTC (rev 58974) +++ branches/usability/acaifix/js/plugins.combined.min.js 2009-11-12 21:43:00 UTC (rev 58975) @@ -131,7 +131,7 @@ return html;},buildRow:function(context,row){var html='<tr>';for(cell in row){html+='<td class="cell cell-'+cell+'" valign="top"><span>'+ $.wikiEditor.autoMsg(row[cell],['html','text'])+'</span></td>';} html+='</tr>';return html;},buildCharacter:function(character,actions){if(typeof character=='string'){character={'label':character,'action':{'type':'encapsulate','options':{'pre':character}}};}else if(0 in character&&1 in character){character={'label':character[0],'action':{'type':'encapsulate','options':{'pre':character[1]}}};} -if('action'in character&&'label'in character){actions[character.label]=character.action;return'<a rel="'+character.label+'" href="#">'+character.label+'</a>';}},buildTab:function(context,id,section){var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');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).bind('mouseup',function(e){$(this).blur();}).bind('mousedown',function(e){if(e.button!==0||e.button&1==0){return true;} +if('action'in character&&'label'in character){actions[character.label]=character.action;return'<a rel="'+character.label+'" href="#">'+character.label+'</a>';}},buildTab:function(context,id,section){var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');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).bind('mouseup',function(e){$(this).blur();}).bind('mousedown',function(e){if(e.button!==0&&(e.button&1)==0){return true;} 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.fadeOut('fast',function(){$(this).css('position','relative');});$(this).parent().parent().find('a').removeClass('current');$sections.css('overflow','hidden');if(show){$section.fadeIn('fast');$sections.animate({'height':$section.outerHeight()},$section.outerHeight()*2,function(){$(this).css('overflow','visible').css('height','auto');});$(this).addClass('current');}else{$sections.css('height',$section.outerHeight()).animate({'height':0},$section.outerHeight()*2,function(){$(this).css('overflow','visible');});} if($.trackAction!=undefined){$.trackAction($section.attr('rel')+'.'+(show?'show':'hide'));} $.cookie('wikiEditor-'+$(this).data('context').instance+'-toolbar-section',show?$section.attr('rel'):null);}).click(function(){return false;}));},buildSection:function(context,id,section){context.$textarea.trigger('wikiEditor-toolbar-buildSection-'+id,[section]);var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');var $section;switch(section.type){case'toolbar':var $section=$('<div />').attr({'class':'toolbar section section-'+id,'rel':id});if('groups'in section){for(group in section.groups){$section.append($.wikiEditor.modules.toolbar.fn.buildGroup(context,group,section.groups[group]));}} _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs