| Index: branches/wmf/1.17wmf1/extensions/LiquidThreads/classes/View.php |
| — | — | @@ -1209,7 +1209,7 @@ |
| 1210 | 1210 | $wgOut->addExtensionStyle( "$wgLiquidThreadsExtensionPath/lqt.css?{$wgStyleVersion}" ); |
| 1211 | 1211 | |
| 1212 | 1212 | # Hack to make old LQT work with new WikiEditor, hopefully --catrope |
| 1213 | | - $wgOut->addModules( array( 'ext.wikiEditor', 'ext.wikiEditor.toolbar.i18n', 'jquery.wikiEditor.toolbar', 'jquery.async', 'jquery.cookie', 'jquery.ui.dialog' ) ); |
| | 1213 | + $wgOut->addModules( array( 'ext.wikiEditor', 'ext.wikiEditor.toolbar.i18n', 'jquery.wikiEditor.toolbar', 'jquery.wikiEditor.dialogs', 'jquery.async', 'jquery.cookie', 'jquery.ui.dialog' ) ); |
| 1214 | 1214 | |
| 1215 | 1215 | self::$stylesAndScriptsDone = true; |
| 1216 | 1216 | } |
| Index: branches/wmf/1.17wmf1/extensions/LiquidThreads/lqt.js |
| — | — | @@ -172,7 +172,8 @@ |
| 173 | 173 | $j(container).find('#wpDiff').hide(); |
| 174 | 174 | |
| 175 | 175 | if ( $j.fn.wikiEditor && $j.wikiEditor.isSupported( $j.wikiEditor.modules.toolbar ) ) { |
| 176 | | - if ( wgWikiEditorPreferences.toolbar.dialogs && $j.wikiEditor.isSupported( $j.wikiEditor.modules.dialogs ) ) { |
| | 176 | + // Dirty hack: use mw.user.options instead of wgWikiEditorPreferences until I think of something better --catrope |
| | 177 | + if ( mediaWiki.user.options.get( 'usebetatoolbar-cgd' ) && $j.wikiEditor.isSupported( $j.wikiEditor.modules.dialogs ) ) { |
| 177 | 178 | $j( '#wpTextbox1' ).addClass( 'toolbar-dialogs' ); |
| 178 | 179 | } |
| 179 | 180 | // Add wikiEditor toolbar |