Merge "Upstream "pulsating dot" widget from VE"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 28 Aug 2019 17:23:53 +0000 (17:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 28 Aug 2019 17:23:53 +0000 (17:23 +0000)
1  2 
resources/Resources.php

diff --combined resources/Resources.php
@@@ -139,16 -139,16 +139,16 @@@ return 
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.base' => [
 -              'scripts' => [
 -                      // This MUST be kept in sync with maintenance/jsduck/eg-iframe.html
 -                      'resources/src/mediawiki.base/mediawiki.errorLogger.js',
 -                      'resources/src/mediawiki.base/mediawiki.base.js',
 -              ],
 -              'dependencies' => 'jquery',
 -              'targets' => [ 'desktop', 'mobile' ],
 -      ],
 -      'mediawiki.legacy.wikibits' => [
 -              'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
 +              'scripts' => array_merge(
 +                      [
 +                              // This MUST be kept in sync with maintenance/jsduck/eg-iframe.html
 +                              'resources/src/mediawiki.base/mediawiki.errorLogger.js',
 +                              'resources/src/mediawiki.base/mediawiki.base.js',
 +                      ],
 +                      $GLOBALS['wgIncludeLegacyJavaScript']
 +                              ? [ 'resources/src/mediawiki.base/legacy.wikibits.js' ]
 +                              : []
 +              ),
                'dependencies' => 'jquery',
                'targets' => [ 'desktop', 'mobile' ],
        ],
                'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
 -      'jquery.qunit' => [
 -              'scripts' => 'resources/lib/qunitjs/qunit.js',
 -              'styles' => 'resources/lib/qunitjs/qunit.css',
 -              'targets' => [ 'desktop', 'mobile' ],
 -      ],
        'jquery.spinner' => [
                'scripts' => 'resources/src/jquery.spinner/spinner.js',
                'styles' => 'resources/src/jquery.spinner/spinner.less',
        ],
  
        /* MediaWiki */
 -      'mediawiki.apihelp' => [
 -              'styles' => 'resources/src/mediawiki.apihelp.css',
 -              'targets' => [ 'desktop' ],
 -      ],
        'mediawiki.template' => [
                'scripts' => 'resources/src/mediawiki.template.js',
                'targets' => [ 'desktop', 'mobile' ],
                'dependencies' => 'mediawiki.template',
        ],
        'mediawiki.apipretty' => [
 -              'styles' => 'resources/src/mediawiki.apipretty.css',
 +              'styles' => [
 +                      'resources/src/mediawiki.apipretty/apipretty.css',
 +                      'resources/src/mediawiki.apipretty/apihelp.css',
 +              ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.api' => [
        'mediawiki.pager.tablePager' => [
                'styles' => 'resources/src/mediawiki.pager.tablePager/TablePager.less',
        ],
+       'mediawiki.pulsatingdot' => [
+               'styles' => [
+                       'resources/src/mediawiki.pulsatingdot/mediawiki.pulsatingdot.less',
+               ],
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
        'mediawiki.searchSuggest' => [
                'targets' => [ 'desktop', 'mobile' ],
                'scripts' => 'resources/src/mediawiki.searchSuggest/searchSuggest.js',
                        'upload-form-label-usage-filename',
                        'action-upload',
                        'apierror-mustbeloggedin',
 +                      'apierror-permissiondenied',
                        'badaccess-groups',
                        'apierror-timeout',
                        'apierror-offline',
        /* MediaWiki Special pages */
  
        'mediawiki.rcfilters.filters.base.styles' => [
 +              'targets' => [ 'desktop', 'mobile' ],
                'skinStyles' => [
                        'default' => 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less',
                ],
                ],
        ],
        'mediawiki.rcfilters.filters.dm' => [
 +              'targets' => [ 'desktop', 'mobile' ],
                'localBasePath' => "$IP/resources/src/mediawiki.rcfilters",
                'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.rcfilters",
                'packageFiles' => [
                ],
        ],
        'mediawiki.rcfilters.filters.ui' => [
 +              'targets' => [ 'desktop', 'mobile' ],
                'localBasePath' => "$IP/resources/src/mediawiki.rcfilters",
                'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.rcfilters",
                'packageFiles' => [
                        'styles/mw.rcfilters.ui.RclToOrFromWidget.less',
                        'styles/mw.rcfilters.ui.RclTargetPageWidget.less',
                        'styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less',
 +                      'styles/mw.rcfilters.ui.FilterTagMultiselectWidgetMobile.less'
                ],
                'skinStyles' => [
                        'vector' => [
                        'rcfilters-clear-all-filters',
                        'rcfilters-show-new-changes',
                        'rcfilters-search-placeholder',
 +                      'rcfilters-search-placeholder-mobile',
                        'rcfilters-invalid-filter',
                        'rcfilters-empty-filter',
                        'rcfilters-filterlist-title',
                        'rcfilters-filter-showlinkedto-label',
                        'rcfilters-filter-showlinkedto-option-label',
                        'rcfilters-target-page-placeholder',
 +                      'rcfilters-allcontents-label',
 +                      'rcfilters-alldiscussions-label',
                        'blanknamespace',
                        'namespaces',
                        'tags-title',
                        'oojs-ui.styles.icons-interactions',
                        'oojs-ui.styles.icons-layout',
                        'oojs-ui.styles.icons-media',
 +                      'oojs-ui-windows.icons'
                ],
        ],
        'mediawiki.interface.helpers.styles' => [
                'class' => ResourceLoaderLessVarFileModule::class,
                'lessMessages' => [
 +                      'comma-separator',
                        'parentheses-start',
                        'parentheses-end',
                        'brackets-start',
                ],
        ],
  
 -      // @todo FIXME: Remove 7 days after Ib0020b6bd0156 is deployed to all wikis.
 -      'html5shiv' => [
 -              'scripts' => [
 -                      'resources/lib/html5shiv/html5shiv.js'
 -              ],
 -      ],
 -
        /* EasyDeflate */
  
        'easy-deflate.core' => [