| Index: branches/REL1_18/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js |
| — | — | @@ -502,9 +502,11 @@ |
| 503 | 503 | } |
| 504 | 504 | }, |
| 505 | 505 | open: function() { |
| | 506 | + // Obtain the server name without the protocol. wgServer may be protocol-relative |
| | 507 | + var serverName = mw.config.get( 'wgServer' ).replace( /^(https?:)?\/\//, '' ); |
| 506 | 508 | // Cache the articlepath regex |
| 507 | 509 | $(this).data( 'articlePathRegex', new RegExp( |
| 508 | | - '^' + $.escapeRE( mw.config.get( 'wgServer' ) + mw.config.get( 'wgArticlePath' ) ) |
| | 510 | + '^https?://' + $.escapeRE( serverName + mw.config.get( 'wgArticlePath' ) ) |
| 509 | 511 | .replace( /\\\$1/g, '(.*)' ) + '$' |
| 510 | 512 | ) ); |
| 511 | 513 | // Pre-fill the text fields based on the current selection |
| — | — | @@ -779,8 +781,11 @@ |
| 780 | 782 | .addClass( 'sortable' ) |
| 781 | 783 | .insertAfter( $( '#wikieditor-toolbar-table-preview' ) ) |
| 782 | 784 | .hide(); |
| 783 | | - if ( typeof jQuery.fn.tablesorter == 'function' ) |
| | 785 | + |
| | 786 | + mw.loader.using( 'jquery.tablesorter', function() { |
| 784 | 787 | $( '#wikieditor-toolbar-table-preview2' ).tablesorter(); |
| | 788 | + }); |
| | 789 | + |
| 785 | 790 | $( '#wikieditor-toolbar-table-sortable' ).click( function() { |
| 786 | 791 | // Swap the currently shown one clone with the other one |
| 787 | 792 | $( '#wikieditor-toolbar-table-preview' ) |
| Property changes on: branches/REL1_18/extensions/WikiEditor |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 788 | 793 | Merged /trunk/extensions/WikiEditor:r100504,100699 |
| Property changes on: branches/REL1_18/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 789 | 794 | Merged /trunk/extensions:r100504,100699 |