| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646 |
| /branches/wmf-deployment/extensions/UsabilityInitiative/OptIn:60970 |
| /trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62127,62139-62140,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66337-67741,67743-67744 |
| /trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| 2 | 2 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646 |
| /branches/wmf-deployment/extensions/UsabilityInitiative/OptIn:60970 |
| /trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62127,62139-62140,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66337-67741,67743-67744,68238 |
| /trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php |
| — | — | @@ -16,16 +16,16 @@ |
| 17 | 17 | array( 'src' => 'Modules/Preview/Preview.js', 'version' => 6 ), |
| 18 | 18 | array( 'src' => 'Modules/Publish/Publish.js', 'version' => 6 ), |
| 19 | 19 | array( 'src' => 'Modules/Toc/Toc.js', 'version' => 7 ), |
| 20 | | - array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 94 ), |
| | 20 | + array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 96 ), |
| 21 | 21 | array( 'src' => 'Modules/TemplateEditor/TemplateEditor.js', 'version' => 6 ), |
| 22 | 22 | array( 'src' => 'Modules/Templates/Templates.js', 'version' => 1 ), |
| 23 | 23 | array( 'src' => 'Modules/AddMediaWizard/AddMediaWizard.js', 'version' => 6 ), |
| 24 | 24 | ), |
| 25 | 25 | 'combined' => array( |
| 26 | | - array( 'src' => 'WikiEditor.combined.js', 'version' => 100 ), |
| | 26 | + array( 'src' => 'WikiEditor.combined.js', 'version' => 103 ), |
| 27 | 27 | ), |
| 28 | 28 | 'minified' => array( |
| 29 | | - array( 'src' => 'WikiEditor.combined.min.js', 'version' => 100 ), |
| | 29 | + array( 'src' => 'WikiEditor.combined.min.js', 'version' => 103 ), |
| 30 | 30 | ), |
| 31 | 31 | ); |
| 32 | 32 | static $messages = array( |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js |
| — | — | @@ -995,15 +995,13 @@ |
| 996 | 996 | // The following things are considered to be external links: |
| 997 | 997 | // * Starts a URL protocol |
| 998 | 998 | // * Starts with www. |
| 999 | | - // * Ends with a . followed by two or more letters |
| 1000 | | - // * Contains a . followed by two or more letters followed by / |
| 1001 | | - // All of these are potentially valid titles, and the latter three |
| | 999 | + // All of these are potentially valid titles, and the latter two |
| 1002 | 1000 | // categories match about 6300 titles in enwiki's ns0. Out of 6.9M |
| 1003 | 1001 | // titles, that's 0.09% |
| 1004 | 1002 | if ( typeof arguments.callee.regex == 'undefined' ) { |
| 1005 | 1003 | // Cache the regex |
| 1006 | 1004 | arguments.callee.regex = |
| 1007 | | - new RegExp( "(^(" + wgUrlProtocols + "))|(^www\\.)|([^.]\\.[a-z]{2,}($|\\/))", 'i'); |
| | 1005 | + new RegExp( "^(" + wgUrlProtocols + "|www\\.)", 'i'); |
| 1008 | 1006 | } |
| 1009 | 1007 | return s.match( arguments.callee.regex ); |
| 1010 | 1008 | } |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | <label for="wikieditor-toolbar-link-type-ext" rel="wikieditor-toolbar-tool-link-ext"></label>\ |
| 24 | 24 | </div>\ |
| 25 | 25 | </div>\ |
| 26 | | - </fieldset>',init:function(){function isExternalLink(s){if(typeof arguments.callee.regex=='undefined'){arguments.callee.regex=new RegExp("(^("+wgUrlProtocols+"))|(^www\\.)|([^.]\\.[a-z]{2,}($|\\/))",'i');} |
| | 26 | + </fieldset>',init:function(){function isExternalLink(s){if(typeof arguments.callee.regex=='undefined'){arguments.callee.regex=new RegExp("^("+wgUrlProtocols+"|www\\.)",'i');} |
| 27 | 27 | return s.match(arguments.callee.regex);} |
| 28 | 28 | function updateWidget(status){$j('#wikieditor-toolbar-link-int-target-status').children().hide();$j('#wikieditor-toolbar-link-int-target').parent().removeClass('status-invalid status-external status-notexists status-exists status-loading');if(status){$j('#wikieditor-toolbar-link-int-target-status-'+status).show();$j('#wikieditor-toolbar-link-int-target').parent().addClass('status-'+status);} |
| 29 | 29 | if(status=='invalid'){$j('.ui-dialog:visible .ui-dialog-buttonpane button:first').attr('disabled',true).addClass('disabled');}else{$j('.ui-dialog:visible .ui-dialog-buttonpane button:first').removeAttr('disabled').removeClass('disabled');}} |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js |
| — | — | @@ -995,15 +995,13 @@ |
| 996 | 996 | // The following things are considered to be external links: |
| 997 | 997 | // * Starts a URL protocol |
| 998 | 998 | // * Starts with www. |
| 999 | | - // * Ends with a . followed by two or more letters |
| 1000 | | - // * Contains a . followed by two or more letters followed by / |
| 1001 | | - // All of these are potentially valid titles, and the latter three |
| | 999 | + // All of these are potentially valid titles, and the latter two |
| 1002 | 1000 | // categories match about 6300 titles in enwiki's ns0. Out of 6.9M |
| 1003 | 1001 | // titles, that's 0.09% |
| 1004 | 1002 | if ( typeof arguments.callee.regex == 'undefined' ) { |
| 1005 | 1003 | // Cache the regex |
| 1006 | 1004 | arguments.callee.regex = |
| 1007 | | - new RegExp( "(^(" + wgUrlProtocols + "))|(^www\\.)|([^.]\\.[a-z]{2,}($|\\/))", 'i'); |
| | 1005 | + new RegExp( "^(" + wgUrlProtocols + "|www\\.)", 'i'); |
| 1008 | 1006 | } |
| 1009 | 1007 | return s.match( arguments.callee.regex ); |
| 1010 | 1008 | } |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1011 | 1009 | - /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,66337-67741,67743-67744,67839,67995,68003,68020,68023 |
| 1012 | 1010 | + /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,66337-67741,67743-67744,67839,67995,68003,68020,68023,68238 |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1013 | 1011 | - /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:60970 |
| /trunk/extensions/UsabilityInitiative/js/plugins/jquery.cookie.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,66337-67741,67743-67744 |
| 1014 | 1012 | + /branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:60970 |
| /trunk/extensions/UsabilityInitiative/js/plugins/jquery.cookie.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,66337-67741,67743-67744,68238 |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1015 | 1013 | - /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,66337-67765,67776,67788 |
| /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 |
| 1016 | 1014 | + /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,66337-67765,67776,67788,68238 |
| /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 |
| 1017 | 1015 | - /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,66337-67741,67743-67744,67776,67839,67995,68003,68020,68023 |
| /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 |
| 1018 | 1016 | + /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,66337-67741,67743-67744,67776,67839,67995,68003,68020,68023,68238 |
| /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 |