| Index: trunk/extensions/UploadWizard/UploadWizardHooks.php |
| — | — | @@ -13,15 +13,12 @@ |
| 14 | 14 | |
| 15 | 15 | public static $modules = array( |
| 16 | 16 | 'ext.uploadWizard' => array( |
| | 17 | + 'dependencies' => array( |
| | 18 | + 'jquery.ui.dialog', |
| | 19 | + 'jquery.ui.datepicker', |
| | 20 | + 'jquery.ui.progressbar' |
| | 21 | + ), |
| 17 | 22 | 'scripts' => array( |
| 18 | | - // jquery ui |
| 19 | | - // FIXME: These can be replaced with dependencies when pre-RL compat is dropped |
| 20 | | - 'resources/jquery.ui/jquery.ui.core.js', |
| 21 | | - 'resources/jquery.ui/jquery.ui.widget.js', |
| 22 | | - 'resources/jquery.ui/jquery.ui.button.js', |
| 23 | | - 'resources/jquery.ui/jquery.ui.dialog.js', |
| 24 | | - 'resources/jquery.ui/jquery.ui.datepicker.js', |
| 25 | | - 'resources/jquery.ui/jquery.ui.progressbar.js', |
| 26 | 23 | |
| 27 | 24 | // jquery interface helpers |
| 28 | 25 | 'resources/jquery/jquery.tipsy.js', |
| — | — | @@ -126,12 +123,6 @@ |
| 127 | 124 | 'resources/jquery/jquery.arrowSteps.css', |
| 128 | 125 | 'resources/jquery/jquery.mwCoolCats.css', |
| 129 | 126 | 'resources/jquery/jquery.removeCtrl.css', |
| 130 | | - 'resources/jquery.ui/themes/vector/jquery.ui.core.css', |
| 131 | | - 'resources/jquery.ui/themes/vector/jquery.ui.theme.css', |
| 132 | | - 'resources/jquery.ui/themes/vector/jquery.ui.button.css', |
| 133 | | - 'resources/jquery.ui/themes/vector/jquery.ui.dialog.css', |
| 134 | | - 'resources/jquery.ui/themes/vector/jquery.ui.datepicker.css', |
| 135 | | - 'resources/jquery.ui/themes/vector/jquery.ui.progressbar.css', |
| 136 | 127 | ), |
| 137 | 128 | 'messages' => array( |
| 138 | 129 | 'linktest', |
| Index: trunk/extensions/UploadWizard/UploadWizard.php |
| — | — | @@ -55,7 +55,7 @@ |
| 56 | 56 | $wgExtensionJavascriptModules[ 'UploadWizard' ] = 'extensions/UploadWizard'; |
| 57 | 57 | |
| 58 | 58 | // Disable ResourceLoader support by default, it's currently broken |
| 59 | | -$wgUploadWizardDisableResourceLoader = true; |
| | 59 | +// $wgUploadWizardDisableResourceLoader = true; |
| 60 | 60 | |
| 61 | 61 | // for ResourceLoader |
| 62 | 62 | $wgHooks['ResourceLoaderRegisterModules'][] = 'UploadWizardHooks::resourceLoaderRegisterModules'; |