Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212917
Change subject: [WIP] OOUI theme support
......................................................................
[WIP] OOUI theme support
1. $wgSkinOOUIThemes['vector'] = 'apex';
2. ????
3. PROFIT!
Bug: T78367
Change-Id: I3fbacbce95126a4cc29221352f3ef846f41e7b1b
---
M docs/extension.schema.json
M includes/DefaultSettings.php
M includes/registration/ExtensionProcessor.php
M includes/resourceloader/ResourceLoader.php
M includes/resourceloader/ResourceLoaderImageModule.php
M maintenance/resources/update-oojs-ui.sh
M resources/Resources.php
A resources/ResourcesOOUI.php
8 files changed, 214 insertions(+), 181 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/17/212917/1
diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index 3b75b72..709421d 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -618,6 +618,9 @@
"ValidSkinNames": {
"type": "object"
},
+ "SkinOOUIThemes": {
+ "type": "object"
+ },
"callback": {
"type": [
"array",
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2ea8b29..58abd7f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6405,6 +6405,11 @@
$wgValidSkinNames = array();
/**
+ * Map of skin name to OOUI theme name to be used for that skin.
+ */
+$wgSkinOOUIThemes = array( 'default' => 'mediawiki' );
+
+/**
* Special page list. This is an associative array mapping the (canonical)
names of
* special pages to either a class name to be instantiated, or a callback to
use for
* creating the special page object. In both cases, the result must be an
instance of
diff --git a/includes/registration/ExtensionProcessor.php
b/includes/registration/ExtensionProcessor.php
index b0398eb..4160fbc 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -44,6 +44,7 @@
'APIPropModules',
'APIListModules',
'ValidSkinNames',
+ 'SkinOOUIThemes',
);
/**
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index b8a0acf..5a9465e 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -247,6 +247,7 @@
// Register core modules
$this->register( include "$IP/resources/Resources.php" );
+ $this->register( include "$IP/resources/ResourcesOOUI.php" );
// Register extension modules
Hooks::run( 'ResourceLoaderRegisterModules', array( &$this ) );
$this->register( $config->get( 'ResourceModules' ) );
diff --git a/includes/resourceloader/ResourceLoaderImageModule.php
b/includes/resourceloader/ResourceLoaderImageModule.php
index 53e0815..f9f7bb8 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -70,21 +70,27 @@
* 'selectorWithVariant' => [CSS selector template, variables:
{prefix} {name} {variant}],
* // List of variants that may be used for the image files
* 'variants' => array(
+ * [theme name] => array(
* [variant name] => array(
* 'color' => [color string, e.g. '#ffff00'],
* 'global' => [boolean, if true, this variant is
available
* for all images of this type],
* ),
+ * ...
+ * ),
* ...
* ),
* // List of image files and their options
* 'images' => array(
+ * [theme name] => array(
* [file path string],
* [file path string] => array(
* 'name' => [image name string, defaults to file
name],
* 'variants' => [array of variant name strings,
variants
* available for this image],
* ),
+ * ...
+ * ),
* ...
* ),
* )
@@ -148,6 +154,17 @@
"Invalid list error.
'$option' given, array expected."
);
}
+ if ( !isset( $option['mediawiki'] ) ) {
+ // Backwards compatibility
+ $option = array( 'mediawiki' =>
$option );
+ }
+ foreach ( $option as $theme => $data ) {
+ if ( !is_array( $option ) ) {
+ throw new
InvalidArgumentException(
+ "Invalid list
error. '$option' given, array expected."
+ );
+ }
+ }
$this->{$member} = $option;
break;
@@ -189,9 +206,9 @@
* @param string $name Image name
* @return ResourceLoaderImage|null
*/
- public function getImage( $name ) {
+ public function getImage( $name, ResourceLoaderContext $context ) {
$this->ensureStuffLoaded();
- $images = $this->getImages();
+ $images = $this->getImages( $context );
return isset( $images[$name] ) ? $images[$name] : null;
}
@@ -199,21 +216,27 @@
* Get ResourceLoaderImage objects for all images.
* @return ResourceLoaderImage[] Array keyed by image name
*/
- public function getImages() {
+ public function getImages( ResourceLoaderContext $context ) {
+ global $wgSkinOOUIThemes;
+ $contextHash = $context->getHash();
+ $theme = isset( $wgSkinOOUIThemes[ $context->getSkin() ] ) ?
+ $wgSkinOOUIThemes[ $context->getSkin() ] :
+ $wgSkinOOUIThemes[ 'default' ];
if ( !isset( $this->imageObjects ) ) {
$this->ensureStuffLoaded();
$this->imageObjects = array();
-
- foreach ( $this->images as $name => $options ) {
+ }
+ if ( !isset( $this->imageObjects[ $contextHash ] ) ) {
+ foreach ( $this->images[ $theme ] as $name => $options
) {
$fileDescriptor = is_string( $options ) ?
$options : $options['file'];
$allowedVariants = array_merge(
is_array( $options ) && isset(
$options['variants'] ) ? $options['variants'] : array(),
- $this->getGlobalVariants()
+ $this->getGlobalVariants( $context )
);
- if ( isset( $this->variants ) ) {
+ if ( isset( $this->variants[ $theme ] ) ) {
$variantConfig = array_intersect_key(
- $this->variants,
+ $this->variants[ $theme ],
array_fill_keys(
$allowedVariants, true )
);
} else {
@@ -227,11 +250,11 @@
$this->localBasePath,
$variantConfig
);
- $this->imageObjects[ $image->getName() ] =
$image;
+ $this->imageObjects[ $contextHash ][
$image->getName() ] = $image;
}
}
- return $this->imageObjects;
+ return $this->imageObjects[ $contextHash ];
}
/**
@@ -239,21 +262,27 @@
* for every image regardless of image options.
* @return string[]
*/
- public function getGlobalVariants() {
+ public function getGlobalVariants( ResourceLoaderContext $context ) {
+ global $wgSkinOOUIThemes;
+ $contextHash = $context->getHash();
+ $theme = isset( $wgSkinOOUIThemes[ $context->getSkin() ] ) ?
+ $wgSkinOOUIThemes[ $context->getSkin() ] :
+ $wgSkinOOUIThemes[ 'default' ];
if ( !isset( $this->globalVariants ) ) {
$this->ensureStuffLoaded();
$this->globalVariants = array();
-
- if ( isset( $this->variants ) ) {
- foreach ( $this->variants as $name => $config )
{
+ }
+ if ( !isset( $this->globalVariants[ $contextHash ] ) ) {
+ if ( isset( $this->variants[ $theme ] ) ) {
+ foreach ( $this->variants[ $theme ] as $name =>
$config ) {
if ( isset( $config['global'] ) &&
$config['global'] ) {
- $this->globalVariants[] = $name;
+ $this->globalVariants[
$contextHash ][] = $name;
}
}
}
}
- return $this->globalVariants;
+ return $this->globalVariants[ $contextHash ];
}
/**
@@ -268,7 +297,7 @@
$script = $context->getResourceLoader()->getLoadScript(
$this->getSource() );
$selectors = $this->getSelectors();
- foreach ( $this->getImages() as $name => $image ) {
+ foreach ( $this->getImages( $context ) as $name => $image ) {
$declarations = $this->getCssDeclarations(
$image->getDataUri( $context, null, 'original'
),
$image->getUrl( $context, $script, null,
'rasterized' )
@@ -366,7 +395,7 @@
public function getModifiedTime( ResourceLoaderContext $context ) {
$this->ensureStuffLoaded();
$files = array();
- foreach ( $this->getImages() as $name => $image ) {
+ foreach ( $this->getImages( $context ) as $name => $image ) {
$files[] = $image->getPath( $context );
}
diff --git a/maintenance/resources/update-oojs-ui.sh
b/maintenance/resources/update-oojs-ui.sh
index d0989e2..000ce08 100755
--- a/maintenance/resources/update-oojs-ui.sh
+++ b/maintenance/resources/update-oojs-ui.sh
@@ -43,11 +43,14 @@
mkdir -p "$REPO_DIR/$TARGET_DIR/i18n"
mkdir -p "$REPO_DIR/$TARGET_DIR/images"
mkdir -p "$REPO_DIR/$TARGET_DIR/themes/mediawiki/images"
-cp
./node_modules/oojs-ui/dist/{oojs-ui-mediawiki-noimages.css,oojs-ui-mediawiki.js,oojs-ui.js}
"$REPO_DIR/$TARGET_DIR"
+mkdir -p "$REPO_DIR/$TARGET_DIR/themes/apex/images"
+cp ./node_modules/oojs-ui/dist/oojs-ui.js "$REPO_DIR/$TARGET_DIR"
+cp
./node_modules/oojs-ui/dist/{oojs-ui-mediawiki-noimages.css,oojs-ui-mediawiki.js}
"$REPO_DIR/$TARGET_DIR"
+cp ./node_modules/oojs-ui/dist/{oojs-ui-apex-noimages.css,oojs-ui-apex.js}
"$REPO_DIR/$TARGET_DIR"
cp -R ./node_modules/oojs-ui/dist/i18n "$REPO_DIR/$TARGET_DIR"
cp -R ./node_modules/oojs-ui/dist/images "$REPO_DIR/$TARGET_DIR"
-cp -R ./node_modules/oojs-ui/dist/themes/mediawiki/images
"$REPO_DIR/$TARGET_DIR/themes/mediawiki"
-cp ./node_modules/oojs-ui/src/themes/mediawiki/*.json
"$REPO_DIR/$TARGET_DIR/themes/mediawiki"
+cp -R ./node_modules/oojs-ui/dist/themes/*/images
"$REPO_DIR/$TARGET_DIR/themes/*"
+cp ./node_modules/oojs-ui/src/themes/*/*.json "$REPO_DIR/$TARGET_DIR/themes/*"
# Clean up temporary area
rm -rf "$NPM_DIR"
diff --git a/resources/Resources.php b/resources/Resources.php
index 237addc..79d8a5a 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1719,164 +1719,4 @@
),
),
- /* OOjs UI */
- // WARNING: OOjs-UI is NOT TESTED with older browsers and is likely to
break
- // if loaded in browsers that don't support ES5
- 'oojs-ui' => array(
- 'scripts' => array(
- 'resources/lib/oojs-ui/oojs-ui.js',
- ),
- 'skinScripts' => array(
- 'default' =>
'resources/lib/oojs-ui/oojs-ui-mediawiki.js',
- ),
- 'dependencies' => array(
- 'es5-shim',
- 'oojs',
- 'oojs-ui.styles',
- 'oojs-ui.styles.icons',
- 'oojs-ui.styles.indicators',
- 'oojs-ui.styles.textures',
- ),
- 'messages' => array(
- 'ooui-dialog-message-accept',
- 'ooui-dialog-message-reject',
- 'ooui-dialog-process-continue',
- 'ooui-dialog-process-dismiss',
- 'ooui-dialog-process-error',
- 'ooui-dialog-process-retry',
- 'ooui-outline-control-move-down',
- 'ooui-outline-control-move-up',
- 'ooui-outline-control-remove',
- 'ooui-toolbar-more',
- 'ooui-toolgroup-collapse',
- 'ooui-toolgroup-expand',
- ),
- 'targets' => array( 'desktop', 'mobile' ),
- ),
-
- 'oojs-ui.styles' => array(
- 'position' => 'top',
- 'styles' => 'resources/src/oojs-ui-local.css', // HACK, see
inside the file
- 'skinStyles' => array(
- 'default' =>
'resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css',
- ),
- 'targets' => array( 'desktop', 'mobile' ),
- ),
-
- 'oojs-ui.styles.icons' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.indicators' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'indicators.json',
- ),
- 'oojs-ui.styles.textures' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'textures.json',
- ),
- 'oojs-ui.styles.icons-alerts' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-alerts.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-content' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-content.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-editing-advanced' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-editing-advanced.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-editing-core' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-editing-core.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-editing-list' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-editing-list.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-editing-styling' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-editing-styling.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-interactions' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-interactions.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-layout' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-layout.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-location' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-location.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-media' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-media.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-moderation' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-moderation.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-movement' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-movement.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-user' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-user.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
- 'oojs-ui.styles.icons-wikimedia' => array(
- 'class' => 'ResourceLoaderImageModule',
- 'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
- 'data' => 'icons-wikimedia.json',
- 'selectorWithoutVariant' => '.oo-ui-icon-{name},
.mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
- 'selectorWithVariant' => '.oo-ui-image-{variant}
.oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name},
.mw-ui-icon-{name}-{variant}:after, .mw-ui-icon-{name}-{variant}:before,
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before',
- ),
-
);
diff --git a/resources/ResourcesOOUI.php b/resources/ResourcesOOUI.php
new file mode 100644
index 0000000..75ae955
--- /dev/null
+++ b/resources/ResourcesOOUI.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Definition of core ResourceLoader modules.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+ die( 'Not an entry point.' );
+}
+
+/* OOjs UI */
+// WARNING: OOjs-UI is NOT TESTED with older browsers and is likely to break
+// if loaded in browsers that don't support ES5
+return call_user_func( function () {
+ global $IP, $wgSkinOOUIThemes;
+
+ $themes = array( 'mediawiki', 'apex' );
+
+ $modules = array();
+ $modules[ 'oojs-ui' ] = array(
+ 'scripts' => array(
+ 'resources/lib/oojs-ui/oojs-ui.js',
+ ),
+ 'skinScripts' => array_combine(
+ array_keys( $wgSkinOOUIThemes ),
+ array_map( function ( $theme ) {
+ // TODO Allow extensions to specify this path
somehow
+ return
"resources/lib/oojs-ui/oojs-ui-$theme.js";
+ }, array_values( $wgSkinOOUIThemes ) )
+ ),
+ 'dependencies' => array(
+ 'es5-shim',
+ 'oojs',
+ 'oojs-ui.styles',
+ 'oojs-ui.styles.icons',
+ 'oojs-ui.styles.indicators',
+ 'oojs-ui.styles.textures',
+ ),
+ 'messages' => array(
+ 'ooui-dialog-message-accept',
+ 'ooui-dialog-message-reject',
+ 'ooui-dialog-process-continue',
+ 'ooui-dialog-process-dismiss',
+ 'ooui-dialog-process-error',
+ 'ooui-dialog-process-retry',
+ 'ooui-outline-control-move-down',
+ 'ooui-outline-control-move-up',
+ 'ooui-outline-control-remove',
+ 'ooui-toolbar-more',
+ 'ooui-toolgroup-collapse',
+ 'ooui-toolgroup-expand',
+ ),
+ 'targets' => array( 'desktop', 'mobile' ),
+ );
+ $modules[ 'oojs-ui.styles' ] = array(
+ 'position' => 'top',
+ 'styles' => 'resources/src/oojs-ui-local.css', // HACK, see
inside the file
+ 'skinStyles' => array_combine(
+ array_keys( $wgSkinOOUIThemes ),
+ array_map( function ( $theme ) {
+ // TODO Allow extensions to specify this path
somehow
+ return
"resources/lib/oojs-ui/oojs-ui-$theme-noimages.css";
+ }, array_values( $wgSkinOOUIThemes ) )
+ ),
+ 'targets' => array( 'desktop', 'mobile' ),
+ );
+
+ $imageModules = array(
+ // Comments for greppability
+ 'icons', // oojs-ui.styles.icons
+ 'indicators', // oojs-ui.styles.indicators
+ 'textures', // oojs-ui.styles.textures
+ 'icons-alerts', // oojs-ui.styles.icons-alerts
+ 'icons-content', // oojs-ui.styles.icons-content
+ 'icons-editing-advanced', //
oojs-ui.styles.icons-editing-advanced
+ 'icons-editing-core', // oojs-ui.styles.icons-editing-core
+ 'icons-editing-list', // oojs-ui.styles.icons-editing-list
+ 'icons-editing-styling', // oojs-ui.styles.icons-editing-styling
+ 'icons-interactions', // oojs-ui.styles.icons-interactions
+ 'icons-layout', // oojs-ui.styles.icons-layout
+ 'icons-location', // oojs-ui.styles.icons-location
+ 'icons-media', // oojs-ui.styles.icons-media
+ 'icons-moderation', // oojs-ui.styles.icons-moderation
+ 'icons-movement', // oojs-ui.styles.icons-movement
+ 'icons-user', // oojs-ui.styles.icons-user
+ 'icons-wikimedia', // oojs-ui.styles.icons-wikimedia
+ );
+ $rootPath = 'resources/lib/oojs-ui/themes';
+
+ foreach ( $imageModules as $name ) {
+ $module = array();
+
+ foreach ( $themes as $theme ) {
+ $dataPath = $IP . '/' . $rootPath . '/' . $theme . '/'
. $name . '.json';
+
+ if ( file_exists( $dataPath ) ) {
+ $data = json_decode( file_get_contents(
$dataPath ), true );
+ array_walk_recursive( $data['images'], function
( &$path ) use ( $rootPath, $theme ) {
+ $path = $rootPath . '/' . $theme . '/'
. $path;
+ } );
+ } else {
+ $data = array();
+ }
+
+ foreach ( $data as $key => $value ) {
+ switch ( $key ) {
+ case 'images':
+ case 'variants':
+ $module[$key][$theme] =
$data[$key];
+ break;
+
+ default:
+ if ( !isset( $module[$key] ) ) {
+ $module[$key] =
$data[$key];
+ } elseif ( $module[$key] ===
$data[$key] ) {
+ // OK
+ } else {
+ throw new Exception(
"Mismatched OOUI theme definitions are not supported" );
+ }
+ break;
+ }
+ }
+ }
+
+ $module['class'] = 'ResourceLoaderImageModule';
+ if ( substr( $name, 0, 5 ) === 'icons' ) {
+ $module['selectorWithoutVariant'] =
'.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before';
+ $module['selectorWithVariant'] =
'.oo-ui-image-{variant} .oo-ui-icon-{name},
.oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:after,
.mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover
.mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before';
+ }
+
+ $modules[ "oojs-ui.styles.$name" ] = $module;
+ }
+
+ return $modules;
+} );
--
To view, visit https://gerrit.wikimedia.org/r/212917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fbacbce95126a4cc29221352f3ef846f41e7b1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits