Merge "Remove obsolete style-only module 'mediawiki.action.history.diff'"

diff --combined resources/Resources.php
index 7d37b50,265be9a..109ab7d
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -717,7 -717,6 +717,7 @@@ return 
                        'az' => 'resources/lib/moment/locale/az.js',
                        'be' => 'resources/lib/moment/locale/be.js',
                        'bg' => 'resources/lib/moment/locale/bg.js',
 +                      'bm' => 'resources/lib/moment/locale/bm.js',
                        'bn' => 'resources/lib/moment/locale/bn.js',
                        'bo' => 'resources/lib/moment/locale/bo.js',
                        'br' => 'resources/lib/moment/locale/br.js',
@@@ -729,7 -728,6 +729,7 @@@
                        'da' => 'resources/lib/moment/locale/da.js',
                        'de' => 'resources/lib/moment/locale/de.js',
                        'de-at' => 'resources/lib/moment/locale/de-at.js',
 +                      'de-ch' => 'resources/lib/moment/locale/de-ch.js',
                        'dv' => 'resources/lib/moment/locale/dv.js',
                        'el' => 'resources/lib/moment/locale/el.js',
                        'en' => 'resources/src/moment-dmy.js',
@@@ -743,13 -741,11 +743,13 @@@
                        'fa' => 'resources/lib/moment/locale/fa.js',
                        'fi' => 'resources/lib/moment/locale/fi.js',
                        'fo' => 'resources/lib/moment/locale/fo.js',
 -                      'fr-ca' => 'resources/lib/moment/locale/fr-ca.js',
                        'fr' => 'resources/lib/moment/locale/fr.js',
 +                      'fr-ca' => 'resources/lib/moment/locale/fr-ca.js',
                        'fy' => 'resources/lib/moment/locale/fy.js',
                        'gd' => 'resources/lib/moment/locale/gd.js',
                        'gl' => 'resources/lib/moment/locale/gl.js',
 +                      'gom-latn' => 'resources/lib/moment/locale/gom-latn.js',
 +                      'gu' => 'resources/lib/moment/locale/gu.js',
                        'he' => 'resources/lib/moment/locale/he.js',
                        'hi' => 'resources/lib/moment/locale/hi.js',
                        'hr' => 'resources/lib/moment/locale/hr.js',
@@@ -762,7 -758,6 +762,7 @@@
                        'jv' => 'resources/lib/moment/locale/jv.js',
                        'ka' => 'resources/lib/moment/locale/ka.js',
                        'kk-cyrl' => 'resources/lib/moment/locale/kk.js',
 +                      'kn' => 'resources/lib/moment/locale/kn.js',
                        'ko' => 'resources/lib/moment/locale/ko.js',
                        'ky' => 'resources/lib/moment/locale/ky.js',
                        'lo' => 'resources/lib/moment/locale/lo.js',
@@@ -781,11 -776,10 +781,11 @@@
                        'nn' => 'resources/lib/moment/locale/nn.js',
                        'pa' => 'resources/lib/moment/locale/pa-in.js',
                        'pl' => 'resources/lib/moment/locale/pl.js',
 -                      'pt-br' => 'resources/lib/moment/locale/pt-br.js',
                        'pt' => 'resources/lib/moment/locale/pt.js',
 +                      'pt-br' => 'resources/lib/moment/locale/pt-br.js',
                        'ro' => 'resources/lib/moment/locale/ro.js',
                        'ru' => 'resources/lib/moment/locale/ru.js',
 +                      'sd' => 'resources/lib/moment/locale/sd.js',
                        'se' => 'resources/lib/moment/locale/se.js',
                        'si' => 'resources/lib/moment/locale/si.js',
                        'sk' => 'resources/lib/moment/locale/sk.js',
@@@ -798,23 -792,19 +798,23 @@@
                        'sw' => 'resources/lib/moment/locale/sw.js',
                        'ta' => 'resources/lib/moment/locale/ta.js',
                        'te' => 'resources/lib/moment/locale/te.js',
 +                      'tet' => 'resources/lib/moment/locale/tet.js',
                        'th' => 'resources/lib/moment/locale/th.js',
                        'tl-ph' => 'resources/lib/moment/locale/tl-ph.js',
                        'tr' => 'resources/lib/moment/locale/tr.js',
                        'tzm' => 'resources/lib/moment/locale/tzm.js',
                        'tzm-latn' => 'resources/lib/moment/locale/tzm-latn.js',
                        'uk' => 'resources/lib/moment/locale/uk.js',
 +                      'ur' => 'resources/lib/moment/locale/ur.js',
                        'uz' => 'resources/lib/moment/locale/uz.js',
 +                      'uz-latn' => 'resources/lib/moment/locale/uz-latn.js',
                        'vi' => 'resources/lib/moment/locale/vi.js',
 +                      'yo' => 'resources/lib/moment/locale/yo.js',
 +                      'zh-hans' => 'resources/lib/moment/locale/zh-cn.js',
 +                      'zh-hant' => 'resources/lib/moment/locale/zh-tw.js',
                        'zh-cn' => 'resources/lib/moment/locale/zh-cn.js',
                        'zh-hk' => 'resources/lib/moment/locale/zh-hk.js',
                        'zh-tw' => 'resources/lib/moment/locale/zh-tw.js',
 -                      'zh-hans' => 'resources/lib/moment/locale/zh-cn.js',
 -                      'zh-hant' => 'resources/lib/moment/locale/zh-tw.js',
                ],
                // HACK: skinScripts come after languageScripts, and we need locale overrides to come
                // after locale definitions
@@@ -957,7 -947,6 +957,7 @@@
                ],
                'dependencies' => [
                        'jquery.footHovzer',
 +                      'oojs-ui-core',
                ],
        ],
        'mediawiki.diff.styles' => [
@@@ -1474,16 -1463,6 +1474,6 @@@
        'mediawiki.action.history.styles' => [
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
        ],
-       // using this module is deprecated, for diff styles use mediawiki.diff.styles instead
-       'mediawiki.action.history.diff' => [
-               'styles' => [
-                       'resources/src/mediawiki/mediawiki.diff.styles.css',
-                       'resources/src/mediawiki/mediawiki.diff.styles.print.css' => [
-                               'media' => 'print'
-                       ],
-               ],
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
        'mediawiki.action.view.dblClickEdit' => [
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js',
                'dependencies' => [
@@@ -1498,7 -1477,6 +1488,7 @@@
                        'metadata-expand',
                        'metadata-collapse',
                ],
 +              'dependencies' => 'mediawiki.action.view.filepage',
        ],
        'mediawiki.action.view.categoryPage.styles' => [
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less',
@@@ -1792,11 -1770,11 +1782,11 @@@
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js',
 +                      'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MainWrapperWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ViewSwitchWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ValuePickerWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js',
 -                      'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitButtonWidget.js',
 -                      'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js',
 +                      'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js',
@@@ -1809,9 -1787,6 +1799,9 @@@
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.LiveUpdateButtonWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MarkSeenButtonWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RcTopSectionWidget.js',
 +                      'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTopSectionWidget.js',
 +                      'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTargetPageWidget.js',
 +                      'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclToOrFromWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.WatchlistTopSectionWidget.js',
                        'resources/src/mediawiki.rcfilters/mw.rcfilters.HighlightColors.js',
                        'resources/src/mediawiki.rcfilters/mw.rcfilters.init.js',
@@@ -1841,14 -1816,9 +1831,14 @@@
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.LiveUpdateButtonWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RcTopSectionWidget.less',
 +                      'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RclToOrFromWidget.less',
 +                      'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RclTargetPageWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less',
                ],
                'skinStyles' => [
 +                      'vector' => [
 +                              'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.vector.less',
 +                      ],
                        'monobook' => [
                                'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.monobook.less',
                                'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.monobook.less',
@@@ -1860,9 -1830,9 +1850,9 @@@
                        'rcfilters-activefilters',
                        'rcfilters-advancedfilters',
                        'rcfilters-group-results-by-page',
 -                      'rcfilters-grouping-title',
                        'rcfilters-limit-title',
 -                      'rcfilters-limit-shownum',
 +                      'rcfilters-limit-and-date-label',
 +                      'rcfilters-date-popup-title',
                        'rcfilters-days-title',
                        'rcfilters-hours-title',
                        'rcfilters-days-show-days',
@@@ -1916,11 -1886,6 +1906,11 @@@
                        'rcfilters-watchlist-markseen-button',
                        'rcfilters-watchlist-edit-watchlist-button',
                        'rcfilters-other-review-tools',
 +                      'rcfilters-filter-showlinkedfrom-label',
 +                      'rcfilters-filter-showlinkedfrom-option-label',
 +                      'rcfilters-filter-showlinkedto-label',
 +                      'rcfilters-filter-showlinkedto-option-label',
 +                      'rcfilters-target-page-placeholder',
                        'blanknamespace',
                        'namespaces',
                        'tags-title',
@@@ -1928,7 -1893,6 +1918,7 @@@
                        'recentchanges-noresult',
                        'recentchanges-timeout',
                        'recentchanges-network',
 +                      'recentchanges-notargetpage',
                        'quotation-marks',
                ],
                'dependencies' => [
@@@ -1937,7 -1901,6 +1927,7 @@@
                        'mediawiki.language',
                        'mediawiki.user',
                        'mediawiki.util',
 +                      'mediawiki.widgets',
                        'mediawiki.rcfilters.filters.dm',
                        'oojs-ui.styles.icons-content',
                        'oojs-ui.styles.icons-moderation',
@@@ -1949,10 -1912,7 +1939,10 @@@
                ],
        ],
        'mediawiki.special' => [
 -              'styles' => 'resources/src/mediawiki.special/mediawiki.special.css',
 +              'styles' => [
 +                      'resources/src/mediawiki.special/mediawiki.special.css',
 +                      'resources/src/mediawiki.special/mediawiki.special.userrights.css',
 +              ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.special.apisandbox.styles' => [
@@@ -2002,8 -1962,6 +1992,8 @@@
                        'api-help-param-integer-minmax',
                        'api-help-param-multi-separate',
                        'api-help-param-multi-max',
 +                      'api-help-param-maxbytes',
 +                      'api-help-param-maxchars',
                        'apisandbox-submit-invalid-fields-title',
                        'apisandbox-submit-invalid-fields-message',
                        'apisandbox-results',
@@@ -2121,7 -2079,6 +2111,7 @@@
                        'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
                        'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js',
                        'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js',
 +                      'resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js',
                ],
                'messages' => [
                        'prefs-tabs-navigation-hint',
@@@ -2259,6 -2216,7 +2249,6 @@@
                ],
        ],
        'mediawiki.special.userrights' => [
 -              'styles' => 'resources/src/mediawiki.special/mediawiki.special.userrights.css',
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userrights.js',
                'dependencies' => [
                        'mediawiki.notification.convertmessagebox',
@@@ -2773,7 -2731,6 +2763,7 @@@
                        'oojs-ui.styles.icons-moderation',
                ],
                'messages' => [
 +                      'ooui-item-remove',
                        'ooui-outline-control-move-down',
                        'ooui-outline-control-move-up',
                        'ooui-outline-control-remove',