Merge "Revert "Add 'mediawiki.skinning.logo' module""

diff --combined resources/Resources.php
index 9bc7b4e,844f232..644ff9c
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -109,7 -109,6 +109,6 @@@ return array
        // Used in the web installer. Test it after modifying this definition!
        'mediawiki.skinning.interface' => array(
                'position' => 'top',
-               // Display wiki logo on .mw-wiki-logo elements.
                'class' => 'ResourceLoaderSkinModule',
                'styles' => array(
                        'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ),
@@@ -136,13 -135,6 +135,6 @@@
                ),
        ),
  
-       // Display wiki logo on .mw-wiki-logo elements.
-       // This is also part of 'mediawiki.skinning.interface' module; the skin shouldn't load them both.
-       'mediawiki.skinning.logo' => array(
-               'position' => 'top',
-               'class' => 'ResourceLoaderSkinModule',
-       ),
- 
        /* jQuery */
  
        'jquery' => array(
@@@ -980,7 -972,6 +972,7 @@@
        ),
        'mediawiki.htmlform.ooui.styles' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.htmlform.ooui.css',
 +              'position' => 'top',
        ),
        'mediawiki.icon' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.icon.less',
@@@ -1736,23 -1727,6 +1728,23 @@@
                'targets' => array( 'desktop', 'mobile' ),
        ),
  
 +      'mediawiki.widgets' => array(
 +              'scripts' => array(
 +                      'resources/src/mediawiki.widgets/mw.widgets.js',
 +                      'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js',
 +              ),
 +              'skinStyles' => array(
 +                      'default' => 'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.css',
 +              ),
 +              'dependencies' => array(
 +                      'oojs-ui',
 +              ),
 +              'messages' => array(
 +                      // …
 +              ),
 +              'targets' => array( 'desktop', 'mobile' ),
 +      ),
 +
        /* es5-shim */
        'es5-shim' => array(
                'scripts' => array(
@@@ -1786,5 -1760,178 +1778,5 @@@
        /* 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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              'class' => 'ResourceLoaderImageModule',
 -              'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
 -              'data' => 'indicators.json',
 -      ),
 -      'oojs-ui.styles.textures' => array(
 -              'position' => 'top',
 -              'class' => 'ResourceLoaderImageModule',
 -              'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
 -              'data' => 'textures.json',
 -      ),
 -      'oojs-ui.styles.icons-alerts' => array(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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(
 -              'position' => 'top',
 -              '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',
 -      ),
 -
 +      // @see ResourcesOOUI.php
  );