| Index: trunk/extensions/LiquidThreads/LiquidThreads.php |
| — | — | @@ -70,7 +70,7 @@ |
| 71 | 71 | |
| 72 | 72 | $wgResourceModules['ext.liquidThreads'] = $lqtResourceTemplate + array( |
| 73 | 73 | 'styles' => array( 'lqt.css', 'jquery/jquery.thread_collapse.css', 'lqt.dialogs.css' ), |
| 74 | | - 'scripts' => array( 'lqt.js', 'jquery/jquery.thread_collapse.js', 'jquery/jquery.autogrow.js' ), |
| | 74 | + 'scripts' => array( 'lqt.js', 'js/lqt.toolbar.js', 'jquery/jquery.thread_collapse.js', 'jquery/jquery.autogrow.js' ), |
| 75 | 75 | 'dependencies' => array( 'jquery.ui.dialog', 'jquery.ui.droppable' ), |
| 76 | 76 | 'messages' => $lqtMessages |
| 77 | 77 | ); |
| — | — | @@ -80,13 +80,6 @@ |
| 81 | 81 | 'dependencies' => array( 'ext.liquidThreads' ) |
| 82 | 82 | ); |
| 83 | 83 | |
| 84 | | -$wgResourceModules['ext.liquidThreads.edit'] = $lqtResourceTemplate + array( |
| 85 | | - 'scripts' => array( 'js/lqt.toolbar.js' ), |
| 86 | | - 'dependancies' => array( 'ext.liquidThreads', 'ext.wikiEditor', 'ext.wikiEditor.toolbar.i18n', |
| 87 | | - 'jquery.wikiEditor.toolbar', 'jquery.wikiEditor.dialogs', |
| 88 | | - 'query.async', 'jquery.cookie') |
| 89 | | -); |
| 90 | | - |
| 91 | 84 | // Hooks |
| 92 | 85 | // Parser Function Setup |
| 93 | 86 | $wgHooks['ParserFirstCallInit'][] = 'LqtHooks::onParserFirstCallInit'; |
| Index: trunk/extensions/LiquidThreads/api/ApiThreadAction.php |
| — | — | @@ -821,6 +821,11 @@ |
| 822 | 822 | |
| 823 | 823 | $result = array( 'inlineeditform' => array( 'html' => $output ) ); |
| 824 | 824 | |
| | 825 | + /* FIXME |
| | 826 | + $result['resources'] = LqtView::getJSandCSS(); |
| | 827 | + $result['resources']['messages'] = LqtView::exportJSLocalisation(); |
| | 828 | + */ |
| | 829 | + |
| 825 | 830 | $this->getResult()->addValue( null, 'threadaction', $result ); |
| 826 | 831 | } |
| 827 | 832 | |
| Index: trunk/extensions/LiquidThreads/lqt.js |
| — | — | @@ -228,7 +228,10 @@ |
| 229 | 229 | liquidThreads.loadInlineEditForm( params, container, |
| 230 | 230 | function() { |
| 231 | 231 | if ( typeof mediaWiki.loader != 'undefined' && mediaWiki.loader ) { |
| 232 | | - mediaWiki.loader.using( 'ext.liquidThreads.edit', |
| | 232 | + mediaWiki.loader.using( |
| | 233 | + [ 'ext.wikiEditor', 'ext.wikiEditor.toolbar.i18n', |
| | 234 | + 'jquery.wikiEditor.toolbar', 'jquery.wikiEditor.dialogs', |
| | 235 | + 'jquery.async', 'jquery.cookie' ], |
| 233 | 236 | finishSetup ); |
| 234 | 237 | } else { |
| 235 | 238 | finishSetup(); |