r66336 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r66335‎ | r66336 | r66337 >
Date:12:10, 13 May 2010
Author:catrope
Status:deferred
Tags:
Comment:
1.16wmf4: Merge UsabilityInitiative to trunk state
Modified paths:
  • /branches/wmf/1.16wmf4/extensions/UsabilityInitiative (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.js (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.min.js (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
@@ -71,7 +71,7 @@
7272 array( 'src' => 'js/plugins/jquery.cookie.js', 'version' => 4 ),
7373 array( 'src' => 'js/plugins/jquery.delayedBind.js', 'version' => 1 ),
7474 array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 14 ),
75 - array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 32 ),
 75+ array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 33 ),
7676 array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 187 ),
7777 array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 53 ),
7878 array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 62 ),
@@ -83,10 +83,10 @@
8484 array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 5 ),
8585 ),
8686 'combined' => array(
87 - array( 'src' => 'js/plugins.combined.js', 'version' => 395 ),
 87+ array( 'src' => 'js/plugins.combined.js', 'version' => 396 ),
8888 ),
8989 'minified' => array(
90 - array( 'src' => 'js/plugins.combined.min.js', 'version' => 395 ),
 90+ array( 'src' => 'js/plugins.combined.min.js', 'version' => 396 ),
9191 ),
9292 ),
9393 );
Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
@@ -16,16 +16,16 @@
1717 array( 'src' => 'Modules/Preview/Preview.js', 'version' => 6 ),
1818 array( 'src' => 'Modules/Publish/Publish.js', 'version' => 6 ),
1919 array( 'src' => 'Modules/Toc/Toc.js', 'version' => 7 ),
20 - array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 88 ),
 20+ array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 89 ),
2121 array( 'src' => 'Modules/TemplateEditor/TemplateEditor.js', 'version' => 6 ),
2222 array( 'src' => 'Modules/Templates/Templates.js', 'version' => 1 ),
2323 array( 'src' => 'Modules/AddMediaWizard/AddMediaWizard.js', 'version' => 6 ),
2424 ),
2525 'combined' => array(
26 - array( 'src' => 'WikiEditor.combined.js', 'version' => 93 ),
 26+ array( 'src' => 'WikiEditor.combined.js', 'version' => 94 ),
2727 ),
2828 'minified' => array(
29 - array( 'src' => 'WikiEditor.combined.min.js', 'version' => 93 ),
 29+ array( 'src' => 'WikiEditor.combined.min.js', 'version' => 94 ),
3030 ),
3131 );
3232 static $messages = array(
Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
@@ -2000,7 +2000,7 @@
20012001 $textarea.textSelection( 'setSelection', { 'start': start,
20022002 'end': mode == 'replace' ? newEnd : end } );
20032003 $j( this ).data( 'offset', mode == 'replace' ? newEnd : end );
2004 - var textbox = typeof context.$iframe != 'undefined' ? context.$iframe[0].contentWindow : $textarea;
 2004+ var textbox = typeof context.$iframe != 'undefined' ? context.$iframe[0].contentWindow : $textarea[0];
20052005 textbox.focus();
20062006 }
20072007 });
Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
@@ -189,7 +189,7 @@
190190 if(!match){$j('#wikieditor-toolbar-replace-nomatch').show();}else if(mode=='replaceAll'){var index;for(var i=0;i<match.length;i++){index=s.indexOf(match[i]);if(index==-1){break;}
191191 s=s.substr(index+match[i].length);var start=index+offset;var end=start+match[i].length;var newEnd=start+replaceStr.length;$textarea.textSelection('setSelection',{'start':start,'end':end}).textSelection('encapsulateSelection',{'peri':replaceStr,'replace':true}).textSelection('setSelection',{'start':start,'end':newEnd});offset=newEnd;}
192192 $j('#wikieditor-toolbar-replace-success').text(u.getMsg('wikieditor-toolbar-tool-replace-success',match.length)).show();$j(this).data('offset',0);}else{var start=match.index+offset;var end=start+match[0].length;var newEnd=start+replaceStr.length;var context=$j(this).data('context');$textarea.textSelection('setSelection',{'start':start,'end':end});if(mode=='replace'){$textarea.textSelection('encapsulateSelection',{'peri':replaceStr,'replace':true}).textSelection('setSelection',{'start':start,'end':newEnd});}
193 -$textarea.textSelection('scrollToCaretPosition');$textarea.textSelection('setSelection',{'start':start,'end':mode=='replace'?newEnd:end});$j(this).data('offset',mode=='replace'?newEnd:end);var textbox=typeof context.$iframe!='undefined'?context.$iframe[0].contentWindow:$textarea;textbox.focus();}});},dialog:{width:500,dialogClass:'wikiEditor-toolbar-dialog',buttons:{'wikieditor-toolbar-tool-replace-button-findnext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'find');},'wikieditor-toolbar-tool-replace-button-replacenext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replace');},'wikieditor-toolbar-tool-replace-button-replaceall':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replaceAll');},'wikieditor-toolbar-tool-replace-close':function(){$j(this).dialog('close');}},open:function(){$j(this).data('offset',0);$j('#wikieditor-toolbar-replace-search').focus();$j('#wikieditor-toolbar-replace-nomatch, #wikieditor-toolbar-replace-success, #wikieditor-toolbar-replace-emptysearch, #wikieditor-toolbar-replace-invalidregex').hide();if(!($j(this).data('onetimeonlystuff'))){$j(this).data('onetimeonlystuff',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode||e.which)==13){var button=$j(this).data('dialogaction')||$j(this).find('button:first');button.click();e.preventDefault();}});$j(this).closest('.ui-dialog').find('button').focus(function(){$j(this).closest('.ui-dialog').data('dialogaction',this);});}
 193+$textarea.textSelection('scrollToCaretPosition');$textarea.textSelection('setSelection',{'start':start,'end':mode=='replace'?newEnd:end});$j(this).data('offset',mode=='replace'?newEnd:end);var textbox=typeof context.$iframe!='undefined'?context.$iframe[0].contentWindow:$textarea[0];textbox.focus();}});},dialog:{width:500,dialogClass:'wikiEditor-toolbar-dialog',buttons:{'wikieditor-toolbar-tool-replace-button-findnext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'find');},'wikieditor-toolbar-tool-replace-button-replacenext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replace');},'wikieditor-toolbar-tool-replace-button-replaceall':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replaceAll');},'wikieditor-toolbar-tool-replace-close':function(){$j(this).dialog('close');}},open:function(){$j(this).data('offset',0);$j('#wikieditor-toolbar-replace-search').focus();$j('#wikieditor-toolbar-replace-nomatch, #wikieditor-toolbar-replace-success, #wikieditor-toolbar-replace-emptysearch, #wikieditor-toolbar-replace-invalidregex').hide();if(!($j(this).data('onetimeonlystuff'))){$j(this).data('onetimeonlystuff',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode||e.which)==13){var button=$j(this).data('dialogaction')||$j(this).find('button:first');button.click();e.preventDefault();}});$j(this).closest('.ui-dialog').find('button').focus(function(){$j(this).closest('.ui-dialog').data('dialogaction',this);});}
194194 var dialog=$j(this).closest('.ui-dialog');var that=this;var context=$j(this).data('context');var textbox=typeof context.$iframe!='undefined'?context.$iframe[0].contentWindow.document:context.$textarea;$j(textbox).bind('keypress.srdialog',function(e){if((e.keyCode||e.which)==13){var button=dialog.data('dialogaction')||dialog.find('button:first');button.click();e.preventDefault();}else if((e.keyCode||e.which)==27){$j(that).dialog('close');}});},close:function(){var context=$j(this).data('context');var textbox=typeof context.$iframe!='undefined'?context.$iframe[0].contentWindow.document:context.$textarea;$j(textbox).unbind('keypress.srdialog');$j(this).closest('.ui-dialog').data('dialogaction',false);}}}}});}});$j(document).ready(function(){if(!wgWikiEditorEnabledModules.templateEditor){return true;}
195195 if(wgNamespaceNumber==10){return true;}
196196 if($j.fn.wikiEditor){$j('textarea#wpTextbox1').wikiEditor('addModule','templateEditor');}});if(wgWikiEditorEnabledModules.addMediaWizard){if(typeof mwAddMediaConfig=='undefined'){mwAddMediaConfig={};}
Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
@@ -1951,7 +1951,7 @@
19521952 $textarea.textSelection( 'setSelection', { 'start': start,
19531953 'end': mode == 'replace' ? newEnd : end } );
19541954 $j( this ).data( 'offset', mode == 'replace' ? newEnd : end );
1955 - var textbox = typeof context.$iframe != 'undefined' ? context.$iframe[0].contentWindow : $textarea;
 1955+ var textbox = typeof context.$iframe != 'undefined' ? context.$iframe[0].contentWindow : $textarea[0];
19561956 textbox.focus();
19571957 }
19581958 });
Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js
@@ -138,7 +138,7 @@
139139 var caretPos = 0, endPos = 0;
140140 if ( $.browser.msie ) {
141141 // IE Support
142 - var postFinished = false;
 142+ var preFinished = false;
143143 var periFinished = false;
144144 var postFinished = false;
145145 var preText, rawPreText, periText;
@@ -167,15 +167,15 @@
168168 * not changed then we know that IE has trimmed a \r\n from the end.
169169 */
170170 do {
171 - if ( !postFinished ) {
 171+ if ( !preFinished ) {
172172 if ( preRange.compareEndPoints( "StartToEnd", preRange ) == 0 ) {
173 - postFinished = true;
 173+ preFinished = true;
174174 } else {
175175 preRange.moveEnd( "character", -1 )
176176 if ( preRange.text == preText ) {
177177 rawPreText += "\r\n";
178178 } else {
179 - postFinished = true;
 179+ preFinished = true;
180180 }
181181 }
182182 }
@@ -203,7 +203,7 @@
204204 }
205205 }
206206 }
207 - } while ( ( !postFinished || !periFinished || !postFinished ) );
 207+ } while ( ( !preFinished || !periFinished || !postFinished ) );
208208 caretPos = rawPreText.replace( /\r\n/g, "\n" ).length;
209209 endPos = caretPos + rawPeriText.replace( /\r\n/g, "\n" ).length;
210210 } else if ( e.selectionStart || e.selectionStart == '0' ) {
Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js
___________________________________________________________________
Name: svn:mergeinfo
211211 - /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:60970
/trunk/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62274,62341,62371,62380,62384,62392-62396,62458,62552,63864-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321
212212 + /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:60970
/trunk/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62274,62341,62371,62380,62384,62392-62396,62458,62552,63864-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66331-66335
Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.js
@@ -6342,7 +6342,7 @@
63436343 var caretPos = 0, endPos = 0;
63446344 if ( $.browser.msie ) {
63456345 // IE Support
6346 - var postFinished = false;
 6346+ var preFinished = false;
63476347 var periFinished = false;
63486348 var postFinished = false;
63496349 var preText, rawPreText, periText;
@@ -6371,15 +6371,15 @@
63726372 * not changed then we know that IE has trimmed a \r\n from the end.
63736373 */
63746374 do {
6375 - if ( !postFinished ) {
 6375+ if ( !preFinished ) {
63766376 if ( preRange.compareEndPoints( "StartToEnd", preRange ) == 0 ) {
6377 - postFinished = true;
 6377+ preFinished = true;
63786378 } else {
63796379 preRange.moveEnd( "character", -1 )
63806380 if ( preRange.text == preText ) {
63816381 rawPreText += "\r\n";
63826382 } else {
6383 - postFinished = true;
 6383+ preFinished = true;
63846384 }
63856385 }
63866386 }
@@ -6407,7 +6407,7 @@
64086408 }
64096409 }
64106410 }
6411 - } while ( ( !postFinished || !periFinished || !postFinished ) );
 6411+ } while ( ( !preFinished || !periFinished || !postFinished ) );
64126412 caretPos = rawPreText.replace( /\r\n/g, "\n" ).length;
64136413 endPos = caretPos + rawPeriText.replace( /\r\n/g, "\n" ).length;
64146414 } else if ( e.selectionStart || e.selectionStart == '0' ) {
Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.min.js
@@ -422,12 +422,12 @@
423423 var range3=document.selection.createRange();range3.collapse(false);range3.moveEnd('character',1);if(range3.text!="\r"&&range3.text!="\n"&&range3.text!=""){options.post+="\n";}}
424424 checkSelectedText();range.text=options.pre+selText+options.post;if(isSample&&range.moveStart){range.moveStart('character',-options.post.length-selText.length);range.moveEnd('character',-options.post.length);}
425425 range.select();this.scrollTop=scrollTop;}
426 -$(this).trigger('encapsulateSelection',[options.pre,options.peri,options.post,options.ownline,options.replace]);});},getCaretPosition:function(options){function getCaret(e){var caretPos=0,endPos=0;if($.browser.msie){var postFinished=false;var periFinished=false;var postFinished=false;var preText,rawPreText,periText;var rawPeriText,postText,rawPostText;var periRange=document.selection.createRange().duplicate();var preRange=document.body.createTextRange();preRange.moveToElementText(e);preRange.setEndPoint("EndToStart",periRange);var postRange=document.body.createTextRange();postRange.moveToElementText(e);postRange.setEndPoint("StartToEnd",periRange);preText=rawPreText=preRange.text;periText=rawPeriText=periRange.text;postText=rawPostText=postRange.text;do{if(!postFinished){if(preRange.compareEndPoints("StartToEnd",preRange)==0){postFinished=true;}else{preRange.moveEnd("character",-1)
427 -if(preRange.text==preText){rawPreText+="\r\n";}else{postFinished=true;}}}
 426+$(this).trigger('encapsulateSelection',[options.pre,options.peri,options.post,options.ownline,options.replace]);});},getCaretPosition:function(options){function getCaret(e){var caretPos=0,endPos=0;if($.browser.msie){var preFinished=false;var periFinished=false;var postFinished=false;var preText,rawPreText,periText;var rawPeriText,postText,rawPostText;var periRange=document.selection.createRange().duplicate();var preRange=document.body.createTextRange();preRange.moveToElementText(e);preRange.setEndPoint("EndToStart",periRange);var postRange=document.body.createTextRange();postRange.moveToElementText(e);postRange.setEndPoint("StartToEnd",periRange);preText=rawPreText=preRange.text;periText=rawPeriText=periRange.text;postText=rawPostText=postRange.text;do{if(!preFinished){if(preRange.compareEndPoints("StartToEnd",preRange)==0){preFinished=true;}else{preRange.moveEnd("character",-1)
 427+if(preRange.text==preText){rawPreText+="\r\n";}else{preFinished=true;}}}
428428 if(!periFinished){if(periRange.compareEndPoints("StartToEnd",periRange)==0){periFinished=true;}else{periRange.moveEnd("character",-1)
429429 if(periRange.text==periText){rawPeriText+="\r\n";}else{periFinished=true;}}}
430430 if(!postFinished){if(postRange.compareEndPoints("StartToEnd",postRange)==0){postFinished=true;}else{postRange.moveEnd("character",-1)
431 -if(postRange.text==postText){rawPostText+="\r\n";}else{postFinished=true;}}}}while((!postFinished||!periFinished||!postFinished));caretPos=rawPreText.replace(/\r\n/g,"\n").length;endPos=caretPos+rawPeriText.replace(/\r\n/g,"\n").length;}else if(e.selectionStart||e.selectionStart=='0'){caretPos=e.selectionStart;endPos=e.selectionEnd;}
 431+if(postRange.text==postText){rawPostText+="\r\n";}else{postFinished=true;}}}}while((!preFinished||!periFinished||!postFinished));caretPos=rawPreText.replace(/\r\n/g,"\n").length;endPos=caretPos+rawPeriText.replace(/\r\n/g,"\n").length;}else if(e.selectionStart||e.selectionStart=='0'){caretPos=e.selectionStart;endPos=e.selectionEnd;}
432432 return options.startAndEnd?[caretPos,endPos]:caretPos;}
433433 return getCaret(this.get(0));},setSelection:function(options){return this.each(function(){if($(this).is(':hidden')){}else if(this.selectionStart||this.selectionStart=='0'){if(options.start>this.selectionEnd){this.selectionEnd=options.end;this.selectionStart=options.start;}else{this.selectionStart=options.start;this.selectionEnd=options.end;}}else if(document.body.createTextRange){var selection=document.body.createTextRange();selection.moveToElementText(this);var length=this.value.length;var newLines=this.value.match(/\n/g);if(newLines)length=length-newLines.length;selection.moveStart('character',options.start);selection.moveEnd('character',-length+options.end);selection.select();}});},scrollToCaretPosition:function(options){function getLineLength(e){return Math.floor(e.scrollWidth/($.os.name=='linux'?7:8));}
434434 function getCaretScrollPosition(e){var text=e.value.replace(/\r/g,"");var caret=$(e).textSelection('getCaretPosition');var lineLength=getLineLength(e);var row=0;var charInLine=0;var lastSpaceInLine=0;for(i=0;i<caret;i++){charInLine++;if(text.charAt(i)==" "){lastSpaceInLine=charInLine;}else if(text.charAt(i)=="\n"){lastSpaceInLine=0;charInLine=0;row++;}
Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php
@@ -63,8 +63,8 @@
6464 'prefswitch-title-off' => 'Turn new features off',
6565 'prefswitch-title-switched-off' => 'Thanks',
6666 'prefswitch-title-feedback' => 'Feedback',
67 - 'prefswitch-success-on' => 'New features are now turned on. We hope you enjoy using the new features. You may always turn them back off by clicking on the "[[Special:UsabilityInitiativePrefSwitch|Take me back]]" link at the top of the page.',
68 - 'prefswitch-success-off' => 'New features are now turned off. Thanks for trying the new features. You may always turn them back on by clicking on the "[[Special:UsabilityInitiativePrefSwitch|New features]]" link at the top of the page.',
 67+ 'prefswitch-success-on' => 'New features are now turned on. We hope you enjoy using the new features. You may always turn them back off by clicking on the "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-on}}]]" link at the top of the page.',
 68+ 'prefswitch-success-off' => 'New features are now turned off. Thanks for trying the new features. You may always turn them back on by clicking on the "[[Special:UsabilityInitiativePrefSwitch|{{int:prefswitch-link-off}}]]" link at the top of the page.',
6969 'prefswitch-success-feedback' => 'Your feedback has been sent.',
7070 'prefswitch-return' => '<hr style="clear:both">
7171 Return to <span class="plainlinks">[$1 $2]</span>.',
@@ -75,11 +75,11 @@
7676 [[File:UsabilityDialogs.png|right|link=|Screenshot of the new content generation dialogs]]
7777 ===Here's what we have changed===
7878 * '''Navigation''': We have improved the navigation for reading and editing pages. Now, the tabs at the top of each page more clearly define whether you are viewing the page or discussion page, and whether you are reading or editing a page.
79 -* '''Editing toolbar improvements''': We have reorganized the editing toolbar to make easier to use. Now, formatting pages is simpler and more intuitive.
 79+* '''Editing toolbar improvements''': We have reorganized the editing toolbar to make easier to use. Now, formatting pages is simpler and more intuitive.
8080 * '''Link wizard''': An easy-to-use tool allows you to add links to other wiki pages as well as links to external sites.
8181 * '''Search improvements''': We have improved search suggestions to get you to the page you are looking for more quickly.
8282 * '''Other new features''': We have also introduced a table wizard to make creating tables easier and find and a replace feature to simplify page editing.
83 -* '''Wikipedia puzzle globe''': we've updated the puzzle globe, read more at the [http://blog.wikimedia.org/2010/05/13/wikipedia-in-3d/ Wikimedia blog.]",
 83+* '''Wikipedia puzzle globe''': We have updated the puzzle globe. Read more at the [http://blog.wikimedia.org/2010/05/13/wikipedia-in-3d/ Wikimedia blog].",
8484 'prefswitch-main-anon' => "===Take Me Back===
8585 If you would like to turn off the new features, <span class=\"plainlinks\">[$1 click here]</span>. You will be asked to login or create an account first.",
8686 'prefswitch-main-on' => "===Feedback?===
Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch
___________________________________________________________________
Name: svn:mergeinfo
8787 - /branches/REL1_15/phase3/extensions/UsabilityInitiative/PrefSwitch:51646
/branches/wmf-deployment/extensions/UsabilityInitiative/PrefSwitch:60970
/trunk/extensions/UsabilityInitiative/PrefSwitch:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321
/trunk/phase3/extensions/UsabilityInitiative/PrefSwitch:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
8888 + /branches/REL1_15/phase3/extensions/UsabilityInitiative/PrefSwitch:51646
/branches/wmf-deployment/extensions/UsabilityInitiative/PrefSwitch:60970
/trunk/extensions/UsabilityInitiative/PrefSwitch:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66331-66335
/trunk/phase3/extensions/UsabilityInitiative/PrefSwitch:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative
___________________________________________________________________
Name: svn:mergeinfo
8989 - /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646
/branches/wmf-deployment/extensions/UsabilityInitiative:60970
/trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66324
/trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,65387,65391,65555,65590
9090 + /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646
/branches/wmf-deployment/extensions/UsabilityInitiative:60970
/trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66324,66331-66335
/trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,65387,65391,65555,65590

Status & tagging log