| Index: branches/wmf/1.18wmf1/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/wmf/1.18wmf1/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' ) ) { |
| Index: branches/wmf/1.18wmf1/extensions/ProofreadPage/proofread.js |
| — | — | @@ -126,15 +126,15 @@ |
| 127 | 127 | '<div id="prp_header" style="">' + |
| 128 | 128 | '<span style="color:gray;font-size:80%;line-height:100%;">' + |
| 129 | 129 | escapeQuotesHTML( mediaWiki.msg( 'proofreadpage_header' ) ) + '</span>' + |
| 130 | | - '<textarea name="wpHeaderTextbox" rows="2" cols="80" tabindex=1>' + escapeQuotesHTML( pageHeader ) + '</textarea><br />' + |
| | 130 | + '<textarea name="wpHeaderTextbox" rows="2" cols="80" tabindex=1>\n' + escapeQuotesHTML( pageHeader ) + '</textarea><br />' + |
| 131 | 131 | '<span style="color:gray;font-size:80%;line-height:100%;">' + |
| 132 | 132 | escapeQuotesHTML( mediaWiki.msg( 'proofreadpage_body' ) ) + '</span></div>' + |
| 133 | | - '<textarea name="wpTextbox1" id="wpTextbox1" tabindex=1 style="height:' + ( self.DisplayHeight - 6 ) + 'px;">' + |
| | 133 | + '<textarea name="wpTextbox1" id="wpTextbox1" tabindex=1 style="height:' + ( self.DisplayHeight - 6 ) + 'px;">\n' + |
| 134 | 134 | escapeQuotesHTML( pageBody ) + '</textarea>' + |
| 135 | 135 | '<div id="prp_footer" style="">' + |
| 136 | 136 | '<span style="color:gray;font-size:80%;line-height:100%;">' + |
| 137 | 137 | escapeQuotesHTML( mediaWiki.msg( 'proofreadpage_footer' ) ) + '</span><br />' + |
| 138 | | - '<textarea name="wpFooterTextbox" rows="2" cols="80" tabindex=1>' + |
| | 138 | + '<textarea name="wpFooterTextbox" rows="2" cols="80" tabindex=1>\n' + |
| 139 | 139 | escapeQuotesHTML( pageFooter ) + '</textarea></div>'; |
| 140 | 140 | } |
| 141 | 141 | |