Merge "Split DateInputWidget & CalendarWidget into a separate ResourceLoader module"

diff --git a/resources/Resources.php b/resources/Resources.php
index 14ab8fe..b446ec8 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1909,9 +1909,6 @@ return array(
 
        'mediawiki.widgets' => array(
                'scripts' => array(
-                       'resources/src/mediawiki.widgets/mw.widgets.js',
-                       'resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js',
-                       'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js',
                        'resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js',
                        'resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js',
                        'resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js',
@@ -1924,28 +1921,22 @@ return array(
                ),
                'skinStyles' => array(
                        'default' => array(
-                               'resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less',
-                               'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less',
                                'resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less',
                        ),
                ),
                'dependencies' => array(
                        'oojs-ui',
                        'mediawiki.widgets.styles',
-                       // DateInputWidget
-                       'moment',
                        // TitleInputWidget
                        'mediawiki.Title',
                        'mediawiki.api',
                        'jquery.byteLimit',
                        // TitleOptionWidget
                        'jquery.autoEllipsis',
+                       // For backwards-compatibility
+                       'mediawiki.widgets.DateInputWidget',
                ),
                'messages' => array(
-                       // DateInputWidget
-                       'mw-widgets-dateinput-no-date',
-                       'mw-widgets-dateinput-placeholder-day',
-                       'mw-widgets-dateinput-placeholder-month',
                        // NamespaceInputWidget
                        'blanknamespace',
                        'namespacesall',
@@ -1965,6 +1956,28 @@ return array(
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
+       'mediawiki.widgets.DateInputWidget' => array(
+               'scripts' => array(
+                       'resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js',
+                       'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js',
+               ),
+               'skinStyles' => array(
+                       'default' => array(
+                               'resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less',
+                               'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less',
+                       ),
+               ),
+               'messages' => array(
+                       'mw-widgets-dateinput-no-date',
+                       'mw-widgets-dateinput-placeholder-day',
+                       'mw-widgets-dateinput-placeholder-month',
+               ),
+               'dependencies' => array(
+                       'oojs-ui',
+                       'moment',
+               ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
 
        /* es5-shim */
        'es5-shim' => array(

diff --git a/resources/src/mediawiki.widgets/mw.widgets.js b/resources/src/mediawiki.widgets/mw.widgets.js
deleted file mode 100644 (file)
index dc8b0cf..0000000
--- a/resources/src/mediawiki.widgets/mw.widgets.js
+++ /dev/null
@@ -1 +0,0 @@
-mediaWiki.widgets = {};

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 1577fff..9ec70b5 100644 (file)
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -2466,6 +2466,9 @@
                        tokens: new Map()
                },
 
+               // OOUI widgets specific to MediaWiki
+               widgets: {},
+
                /**
                 * Registry and firing of events.
                 *