Merge "Refactor registration of OOjs UI resource modules"

diff --git a/resources/Resources.php b/resources/Resources.php
index 7deabf0..f60204f 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1863,6 +1863,7 @@ return [
                        'mediawiki.jqueryMsg',
                        'mediawiki.util',
                        'oojs-ui',
+                       'oojs-ui.styles.icons-moderation',
                        'mediawiki.widgets.datetime',
                ],
                'messages' => [
@@ -2393,6 +2394,7 @@ return [
                ],
                'dependencies' => [
                        'oojs-ui-core',
+                       'oojs-ui.styles.icons-moderation',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],

diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index da8bdcd..bf26f50 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@ -1340,7 +1340,7 @@
                                        nooptional: true
                                } );
                                button = new OO.ui.ButtonWidget( {
-                                       icon: 'remove',
+                                       icon: 'trash',
                                        flags: 'destructive'
                                } );
                                layout = new OO.ui.ActionFieldLayout(

diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
index 3e4c5e2..e42ab25 100644 (file)
--- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
+++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
@@ -412,7 +412,7 @@
                        this.clearButton = new OO.ui.ButtonWidget( {
                                classes: [ 'mw-widgets-datetime-dateTimeInputWidget-field', 'mw-widgets-datetime-dateTimeInputWidget-clearButton' ],
                                framed: false,
-                               icon: 'remove',
+                               icon: 'trash',
                                disabled: disabled
                        } ).connect( this, {
                                click: 'onClearClick'