http://www.mediawiki.org/wiki/Special:Code/MediaWiki/82809
Revision: 82809
Author: kaldari
Date: 2011-02-25 19:51:21 +0000 (Fri, 25 Feb 2011)
Log Message:
-----------
using jQuery from ResourceLoader instead of rolling our own
Modified Paths:
--------------
trunk/extensions/UploadWizard/UploadWizard.php
trunk/extensions/UploadWizard/UploadWizardHooks.php
Modified: trunk/extensions/UploadWizard/UploadWizard.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizard.php 2011-02-25 19:34:56 UTC
(rev 82808)
+++ trunk/extensions/UploadWizard/UploadWizard.php 2011-02-25 19:51:21 UTC
(rev 82809)
@@ -55,7 +55,7 @@
$wgExtensionJavascriptModules[ 'UploadWizard' ] = 'extensions/UploadWizard';
// Disable ResourceLoader support by default, it's currently broken
-$wgUploadWizardDisableResourceLoader = true;
+// $wgUploadWizardDisableResourceLoader = true;
// for ResourceLoader
$wgHooks['ResourceLoaderRegisterModules'][] =
'UploadWizardHooks::resourceLoaderRegisterModules';
Modified: trunk/extensions/UploadWizard/UploadWizardHooks.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizardHooks.php 2011-02-25 19:34:56 UTC
(rev 82808)
+++ trunk/extensions/UploadWizard/UploadWizardHooks.php 2011-02-25 19:51:21 UTC
(rev 82809)
@@ -13,15 +13,12 @@
public static $modules = array(
'ext.uploadWizard' => array(
+ 'dependencies' => array(
+ 'jquery.ui.dialog',
+ 'jquery.ui.datepicker',
+ 'jquery.ui.progressbar'
+ ),
'scripts' => array(
- // jquery ui
- // FIXME: These can be replaced with
dependencies when pre-RL compat is dropped
- 'resources/jquery.ui/jquery.ui.core.js',
- 'resources/jquery.ui/jquery.ui.widget.js',
- 'resources/jquery.ui/jquery.ui.button.js',
- 'resources/jquery.ui/jquery.ui.dialog.js',
- 'resources/jquery.ui/jquery.ui.datepicker.js',
- 'resources/jquery.ui/jquery.ui.progressbar.js',
// jquery interface helpers
'resources/jquery/jquery.tipsy.js',
@@ -126,12 +123,6 @@
'resources/jquery/jquery.arrowSteps.css',
'resources/jquery/jquery.mwCoolCats.css',
'resources/jquery/jquery.removeCtrl.css',
-
'resources/jquery.ui/themes/vector/jquery.ui.core.css',
-
'resources/jquery.ui/themes/vector/jquery.ui.theme.css',
-
'resources/jquery.ui/themes/vector/jquery.ui.button.css',
-
'resources/jquery.ui/themes/vector/jquery.ui.dialog.css',
-
'resources/jquery.ui/themes/vector/jquery.ui.datepicker.css',
-
'resources/jquery.ui/themes/vector/jquery.ui.progressbar.css',
),
'messages' => array(
'linktest',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
