| Index: branches/REL1_18/extensions/LiquidThreads/lqt.js |
| — | — | @@ -835,6 +835,9 @@ |
| 836 | 836 | var linkTitle = thread.find('.lqt-thread-title-metadata').val(); |
| 837 | 837 | var linkURL = wgArticlePath.replace( "$1", linkTitle.replace(/ /g, '_' ) ); |
| 838 | 838 | linkURL = wgServer + linkURL; |
| | 839 | + if ( linkURL.substr( 0, 2 ) == '//' ) { |
| | 840 | + linkURL = window.location.protocol + linkURL; |
| | 841 | + } |
| 839 | 842 | liquidThreads.showLinkWindow( linkTitle, linkURL ); |
| 840 | 843 | }, |
| 841 | 844 | |
| Property changes on: branches/REL1_18/extensions/LiquidThreads |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 842 | 845 | Merged /trunk/extensions/LiquidThreads:r99022 |
| Index: branches/REL1_18/extensions/WikiEditor/WikiEditor.php |
| — | — | @@ -504,8 +504,5 @@ |
| 505 | 505 | ), |
| 506 | 506 | 'ext.wikiEditor.toolbar.hideSig' => $wikiEditorTpl + array( |
| 507 | 507 | 'scripts' => 'ext.wikiEditor.toolbar.hideSig.js', |
| 508 | | - 'dependencies' => array( |
| 509 | | - 'ext.wikiEditor', |
| 510 | | - ) |
| 511 | 508 | ), |
| 512 | 509 | ); |
| Index: branches/REL1_18/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.hideSig.js |
| — | — | @@ -2,7 +2,10 @@ |
| 3 | 3 | * Remove the signature button if the main namespace is edited. |
| 4 | 4 | */ |
| 5 | 5 | $( document ).ready( function() { |
| 6 | | - if ( !$.wikiEditor.isSupported( $.wikiEditor.modules.toolbar ) ) { |
| | 6 | + // This module is designed not to depend on ext.wikiEditor or jquery.wikiEditor. |
| | 7 | + // Removing this dependency fixed various bugs, but it does mean that we have to |
| | 8 | + // account for the situation where $.wikiEditor is not present |
| | 9 | + if ( !$.wikiEditor || !$.wikiEditor.isSupported( $.wikiEditor.modules.toolbar ) ) { |
| 7 | 10 | return; |
| 8 | 11 | } |
| 9 | 12 | if ( $( 'body' ).hasClass( 'ns-0' ) ) { |
| Property changes on: branches/REL1_18/extensions/WikiEditor |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 10 | 13 | Merged /trunk/extensions/WikiEditor:r98432,99022 |
| Property changes on: branches/REL1_18/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 11 | 14 | Merged /trunk/extensions:r98432,99022 |