r59203 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r59202‎ \| r59203 \| r59204 >
Date:	18:45, 18 November 2009
Author:	catrope
Status:	deferred
Tags:
Comment:	usability: Merge r59202 from trunk to acaifix
Modified paths:	/branches/usability/acaifix (modified) (history) /branches/usability/acaifix/ClickTracking (modified) (history) /branches/usability/acaifix/CollapsibleTabs/CollapsibleTabs.js (modified) (history) /branches/usability/acaifix/EditToolbar/EditToolbar.js (modified) (history) /branches/usability/acaifix/OptIn (modified) (history) /branches/usability/acaifix/OptIn/SpecialOptIn.php (modified) (history) /branches/usability/acaifix/UsabilityInitiative.hooks.php (modified) (history) /branches/usability/acaifix/js/plugins.combined.js (modified) (history) /branches/usability/acaifix/js/plugins.combined.min.js (modified) (history) /branches/usability/acaifix/js/plugins/jquery.wikiEditor.toolbar.js (modified) (history)

Diff [purge]

Property changes on: branches/usability/acaifix/OptIn/SpecialOptIn.php
___________________________________________________________________
Name: svn:mergeinfo
1	1	- /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:51646
/trunk/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56151-57234,57956,58926,58973-58974,59146
/trunk/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447
2	2	+ /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:51646
/trunk/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56151-57234,57956,58926,58973-58974,59146,59202
/trunk/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447
Property changes on: branches/usability/acaifix/OptIn
___________________________________________________________________
Name: svn:mergeinfo
3	3	- /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646
/trunk/extensions/UsabilityInitiative/OptIn:56151-57234,58926,58973-58974,59146
/trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447
4	4	+ /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646
/trunk/extensions/UsabilityInitiative/OptIn:56151-57234,58926,58973-58974,59146,59202
/trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447
Property changes on: branches/usability/acaifix/CollapsibleTabs/CollapsibleTabs.js
___________________________________________________________________
Name: svn:mergeinfo
5	5	- /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
6	6	+ /branches/REL1_15/phase3/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:51646
/trunk/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:56151-57234,58926,58973-58974,59202
/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
Index: branches/usability/acaifix/UsabilityInitiative.hooks.php
—	—	@@ -67,15 +67,15 @@
68	68	array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 6 ),
69	69	array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 18 ),
70	70	array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 14 ),
71		~~- array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 22 ),~~
	71	+ array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 23 ),
72	72	array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 8 ),
73	73	array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 27 ),
74	74	),
75	75	'combined' => array(
76		~~- array( 'src' => 'js/plugins.combined.js', 'version' => 66 ),~~
	76	+ array( 'src' => 'js/plugins.combined.js', 'version' => 67 ),
77	77	),
78	78	'minified' => array(
79		~~- array( 'src' => 'js/plugins.combined.min.js', 'version' => 66 ),~~
	79	+ array( 'src' => 'js/plugins.combined.min.js', 'version' => 67 ),
80	80	),
81	81	),
82	82	);
Property changes on: branches/usability/acaifix/ClickTracking
___________________________________________________________________
Name: svn:mergeinfo
83	83	- /branches/REL1_15/phase3/extensions/UsabilityInitiative/ClickTracking:51646
/trunk/extensions/UsabilityInitiative/ClickTracking:56151-57234,58926,58973-58974,59048
/trunk/phase3/extensions/UsabilityInitiative/ClickTracking:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447
84	84	+ /branches/REL1_15/phase3/extensions/UsabilityInitiative/ClickTracking:51646
/trunk/extensions/UsabilityInitiative/ClickTracking:56151-57234,58926,58973-58974,59048,59202
/trunk/phase3/extensions/UsabilityInitiative/ClickTracking:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447
Property changes on: branches/usability/acaifix/EditToolbar/EditToolbar.js
___________________________________________________________________
Name: svn:mergeinfo
85	85	- /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646
/trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56151-57234,57425,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
86	86	+ /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646
/trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56151-57234,57425,58926,58973-58974,59202
/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
Index: branches/usability/acaifix/js/plugins/jquery.wikiEditor.toolbar.js
—	—	@@ -466,14 +466,7 @@
467	467	.bind( 'mouseup', function( e ) {
468	468	$(this).blur();
469	469	} )
470		~~- .bind( 'mousedown', function( e ) {~~
471		~~- // Only act when the primary mouse button was pressed~~
472		~~- // This is a terrible hack: IE and Safari use a 1/2/4 bitmask,~~
473		~~- // but Firefox uses 0/1/2~~
474		~~- // See http://quirksmode.org/dom/w3c_events.html#miscprop~~
475		~~- if ( e.button !== 0 && ( e.button & 1 ) == 0) {~~
476		~~- return true;~~
477		~~- }~~
	470	+ .bind( 'click', function( e ) {
478	471	var $sections = $(this).data( 'context' ).$ui.find( '.sections' );
479	472	var $section =
480	473	$(this).data( 'context' ).$ui.find( '.section-' + $(this).parent().attr( 'rel' ) );
—	—	@@ -504,8 +497,8 @@
505	498	'wikiEditor-' + $(this).data( 'context' ).instance + '-toolbar-section',
506	499	show ? $section.attr( 'rel' ) : null
507	500	);
	501	+ return false;
508	502	} )
509		~~- .click( function() { return false; } )~~
510	503	);
511	504	},
512	505	buildSection : function( context, id, section ) {
Property changes on: branches/usability/acaifix/js/plugins/jquery.wikiEditor.toolbar.js
___________________________________________________________________
Name: svn:mergeinfo
513	506	- /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
514	507	+ /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,59202
/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
Index: branches/usability/acaifix/js/plugins.combined.js
—	—	@@ -2013,14 +2013,7 @@
2014	2014	.bind( 'mouseup', function( e ) {
2015	2015	$(this).blur();
2016	2016	} )
2017		~~- .bind( 'mousedown', function( e ) {~~
2018		~~- // Only act when the primary mouse button was pressed~~
2019		~~- // This is a terrible hack: IE and Safari use a 1/2/4 bitmask,~~
2020		~~- // but Firefox uses 0/1/2~~
2021		~~- // See http://quirksmode.org/dom/w3c_events.html#miscprop~~
2022		~~- if ( e.button !== 0 && ( e.button & 1 ) == 0) {~~
2023		~~- return true;~~
2024		~~- }~~
	2017	+ .bind( 'click', function( e ) {
2025	2018	var $sections = $(this).data( 'context' ).$ui.find( '.sections' );
2026	2019	var $section =
2027	2020	$(this).data( 'context' ).$ui.find( '.section-' + $(this).parent().attr( 'rel' ) );
—	—	@@ -2051,8 +2044,8 @@
2052	2045	'wikiEditor-' + $(this).data( 'context' ).instance + '-toolbar-section',
2053	2046	show ? $section.attr( 'rel' ) : null
2054	2047	);
	2048	+ return false;
2055	2049	} )
2056		~~- .click( function() { return false; } )~~
2057	2050	);
2058	2051	},
2059	2052	buildSection : function( context, id, section ) {
Index: branches/usability/acaifix/js/plugins.combined.min.js
—	—	@@ -135,10 +135,9 @@
136	136	return html;},buildRow:function(context,row){var html='<tr>';for(cell in row){html+='<td class="cell cell-'+cell+'" valign="top"><span>'+
137	137	$.wikiEditor.autoMsg(row[cell],['html','text'])+'</span></td>';}
138	138	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]}}};}
139		-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;}
140		-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');});}
	139	+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('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.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');});}
141	140	if($.trackAction!=undefined){$.trackAction($section.attr('rel')+'.'+(show?'show':'hide'));}
142		-$.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]));}}
	141	+$.cookie('wikiEditor-'+$(this).data('context').instance+'-toolbar-section',show?$section.attr('rel'):null);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]));}}
143	142	break;case'booklet':var $pages=$('<div />').addClass('pages');var $index=$('<div />').addClass('index');if('pages'in section){for(page in section.pages){$pages.append($.wikiEditor.modules.toolbar.fn.buildPage(context,page,section.pages[page]));$index.append($.wikiEditor.modules.toolbar.fn.buildBookmark(context,page,section.pages[page]));}}
144	143	$section=$('<div />').attr({'class':'booklet section section-'+id,'rel':id}).append($index).append($pages);$.wikiEditor.modules.toolbar.fn.updateBookletSelection(context,page,$pages,$index);break;}
145	144	if($section!==null&&id!=='main'){var show=selected==id;$section.css('display',show?'block':'none');}
Property changes on: branches/usability/acaifix
___________________________________________________________________
Name: svn:mergeinfo
146	145	- /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
147	146	+ /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646
/trunk/extensions/UsabilityInitiative:56151-57234,58926,58973-58974,59202
/trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r59202	UsabilityInitiative: Per Tim's CR comments, go back to using click() instead ...	catrope	18:41, 18 November 2009

Status & tagging log

23:32, 9 December 2009 Tim Starling (talk | contribs) changed the status of r59203 [removed: new added: deferred]