From d12941d582edab1be944dea4c79b9da0e07b23ca Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@gmail.com>
Date: Mon, 28 Sep 2015 15:56:26 -0700
Subject: [PATCH] Split DateInputWidget & CalendarWidget into a separate
 ResourceLoader module

...as the first step to splitting up the 'mediawiki.widgets' module.

For backwards-compatibility, it is a dependency of 'mediawiki.widgets'
until extensions that use the widget can be updated.

Also create the `mediaWiki.widgets` object in mediawiki.js instead of
having an entire file just for that one line.

Bug: T108733
Change-Id: Ife4cfba278dad063a3609929ff87eda7c877d589
---
 resources/Resources.php                       | 35 +++++++++++++------
 resources/src/mediawiki.widgets/mw.widgets.js |  1 -
 resources/src/mediawiki/mediawiki.js          |  3 ++
 3 files changed, 27 insertions(+), 12 deletions(-)
 delete mode 100644 resources/src/mediawiki.widgets/mw.widgets.js

diff --git a/resources/Resources.php b/resources/Resources.php
index 335775f100..b679437fe8 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1890,9 +1890,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',
@@ -1905,28 +1902,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',
@@ -1946,6 +1937,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
index dc8b0cf0e3..0000000000
--- 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 5dd2acbd81..f4c4ff1b8f 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -2450,6 +2450,9 @@
 			tokens: new Map()
 		},
 
+		// OOUI widgets specific to MediaWiki
+		widgets: {},
+
 		/**
 		 * Registry and firing of events.
 		 *
-- 
2.20.1