From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 29 Sep 2015 22:40:05 +0000 (+0000)
Subject: Merge "Split DateInputWidget & CalendarWidget into a separate ResourceLoader module"
X-Git-Tag: 1.31.0-rc.0~9659
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=7c9909f09dbb1dad994a0cc8b89db1a97b74073b;hp=936fc308365f762b785a92e8f558a8b5978751d5;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 14ab8fe19e..b446ec8d06 100644
--- 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
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 1577fff0e2..9ec70b5277 100644
--- 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.
 		 *