r79821 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79820‎ | r79821 | r79822 >
Date:16:05, 7 January 2011
Author:catrope
Status:ok
Tags:
Comment:
Break WikiEditor's toolbar messages out into a separate module so LiquidThreads can load them without having to load all of ext.wikiEditor (doing the latter causes the toolbar to appear twice; previously LQT loaded just jquery.wikiEditor but that way it didn't get the messages). This might not be the cleanest fix, but it works.
Modified paths:
  • /trunk/extensions/LiquidThreads/lqt.js (modified) (history)
  • /trunk/extensions/WikiEditor/WikiEditor.php (modified) (history)

Diff [purge]

Index: trunk/extensions/LiquidThreads/lqt.js
@@ -228,7 +228,8 @@
229229 function() {
230230 if ( typeof mediaWiki.loader != 'undefined' && mediaWiki.loader ) {
231231 mediaWiki.loader.using(
232 - [ 'ext.wikiEditor', 'jquery.wikiEditor.toolbar',
 232+ [ 'ext.wikiEditor', 'ext.wikiEditor.toolbar.i18n',
 233+ 'jquery.wikiEditor.toolbar',
233234 'jquery.async', 'jquery.cookie' ],
234235 finishSetup );
235236 } else {
Index: trunk/extensions/WikiEditor/WikiEditor.php
@@ -275,10 +275,13 @@
276276 'scripts' => 'ext.wikiEditor.toolbar.js',
277277 'dependencies' => array(
278278 'ext.wikiEditor',
 279+ 'ext.wikiEditor.toolbar.i18n',
279280 'jquery.wikiEditor.toolbar',
280281 'jquery.cookie',
281282 'jquery.async',
282 - ),
 283+ )
 284+ ),
 285+ 'ext.wikiEditor.toolbar.i18n' => $wikiEditorTpl + array(
283286 'messages' => array(
284287 // This is a mixed bunch that needs to be separated between dialog and toolbar messages, but since the
285288 // dialog module depends on the toolbar module, it's not an urgent matter

Follow-up revisions

RevisionCommit summaryAuthorDate
r802571.17: MFT r79821, r79842, r79970, r79973, r79975, r79978, r80057, r80058, r80...catrope12:35, 14 January 2011

Status & tagging log