wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-24 02:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use proper conditional registration for jquery.uls

Browse source 
Previously worked by checking for the UniversalLanguageSelector
extension, now actually checks for the modules themselves.

Change-Id: I99b1bfabb1953579d3aaa661ab0a4d824a7fe656
This commit is contained in:
Roan Kattouw 2013-12-05 14:45:44 -08:00
parent d17e031d46
commit 3b82dc5cf3
1 changed files with 58 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
VisualEditor.hooks.php
View file

@ -28,42 +28,6 @@ class VisualEditorHooks {
$wgResourceModules['ext.visualEditor.viewPageTarget.init']['messages'][] = $msg;
}
}
// Only load jquery.ULS if ULS Extension isn't already installed:
if ( !class_exists( 'UniversalLanguageSelectorHooks' ) ) {
$wgResourceModules['jquery.uls'] = $wgVisualEditorResourceTemplate + array(
'scripts' => array(
'jquery.uls/src/jquery.uls.core.js',
'jquery.uls/src/jquery.uls.lcd.js',
'jquery.uls/src/jquery.uls.languagefilter.js',
'jquery.uls/src/jquery.uls.regionfilter.js',
),
'styles' => array(
'jquery.uls/css/jquery.uls.css',
'jquery.uls/css/jquery.uls.lcd.css',
),
'dependencies' => array(
'jquery.uls.grid',
'jquery.uls.data',
'jquery.uls.compact',
),
);
$wgResourceModules['jquery.uls.data'] = $wgVisualEditorResourceTemplate + array(
'scripts' => array(
'jquery.uls/src/jquery.uls.data.js',
'jquery.uls/src/jquery.uls.data.utils.js',
),
'position' => 'top',
);
$wgResourceModules['jquery.uls.grid'] = $wgVisualEditorResourceTemplate + array(
'styles' => 'jquery.uls/css/jquery.uls.grid.css',
'position' => 'top',
);
$wgResourceModules['jquery.uls.compact'] = $wgVisualEditorResourceTemplate + array(
'styles' => 'jquery.uls/css/jquery.uls.compact.css',
'position' => 'top',
);
}
}
/**
@ -405,6 +369,10 @@ class VisualEditorHooks {
/**
* Conditionally register the oojs and oojs-ui modules, in case they've already been registered
* by a more recent version of MediaWiki core.
*
* Also conditionally register the jquery.uls modules, in case they've already been registered
* by the UniversalLanguageSelector extension.
*
* @param ResourceLoader $resourceLoader
* @returns boolean true
*/
@ -441,6 +409,60 @@ class VisualEditorHooks {
'targets' => array( 'desktop', 'mobile' ),
) );
}
if ( !isset( $wgResourceModules['jquery.uls'] ) && !$resourceLoader->getModule( 'jquery.uls' ) ) {
$resourceLoader->register( 'jquery.uls', $wgVisualEditorResourceTemplate + array(
'scripts' => array(
'jquery.uls/src/jquery.uls.core.js',
'jquery.uls/src/jquery.uls.lcd.js',
'jquery.uls/src/jquery.uls.languagefilter.js',
'jquery.uls/src/jquery.uls.regionfilter.js',
),
'styles' => array(
'jquery.uls/css/jquery.uls.css',
'jquery.uls/css/jquery.uls.lcd.css',
),
'dependencies' => array(
'jquery.uls.grid',
'jquery.uls.data',
'jquery.uls.compact',
),
) );
}
if (
!isset( $wgResourceModules['jquery.uls.data'] ) &&
!$resourceLoader->getModule( 'jquery.uls.data' )
) {
$resourceLoader->register( 'jquery.uls.data', $wgVisualEditorResourceTemplate + array(
'scripts' => array(
'jquery.uls/src/jquery.uls.data.js',
'jquery.uls/src/jquery.uls.data.utils.js',
),
'position' => 'top',
) );
}
if (
!isset( $wgResourceModules['jquery.uls.grid'] ) &&
!$resourceLoader->getModule( 'jquery.uls.grid' )
) {
$resourceLoader->register( 'jquery.uls.grid', $wgVisualEditorResourceTemplate + array(
'styles' => 'jquery.uls/css/jquery.uls.grid.css',
'position' => 'top',
) );
}
if (
!isset( $wgResourceModules['jquery.uls.compact'] ) &&
!$resourceLoader->getModule( 'jquery.uls.compact' )
) {
$resourceLoader->register( 'jquery.uls.compact', $wgVisualEditorResourceTemplate + array(
'styles' => 'jquery.uls/css/jquery.uls.compact.css',
'position' => 'top',
) );
}
return true;
}