From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Wed, 16 Sep 2015 16:45:22 +0000 (+0200)
Subject: mw.widgets.DateInputWidget: Ensure newly opened calendar shows current selection
X-Git-Tag: 1.31.0-rc.0~9990^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=64b3a9b57de15a154effcf4d9618936d252042da

mw.widgets.DateInputWidget: Ensure newly opened calendar shows current selection

CalendarWidget's #resetUI method was previously unused, it was clearly
implemented for this purpose.

Change-Id: I865a289b331d6163fb56f9e0ec3918cfd2b91343
---

diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
index d519c0df54..19dfc9a8b8 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
@@ -427,7 +427,7 @@
 	 * Reset the user interface of this widget to reflect selected date.
 	 */
 	mw.widgets.CalendarWidget.prototype.resetUI = function () {
-		this.moment = moment( this.getDate(), this.getDateFormat() );
+		this.moment = this.getDate() !== null ? moment( this.getDate(), this.getDateFormat() ) : moment();
 		this.displayLayer = this.getDisplayLayers()[ 0 ];
 		this.updateUI();
 	};
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
index b478c4a95c..657d9c540a 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
@@ -324,6 +324,7 @@
 	 * @private
 	 */
 	mw.widgets.DateInputWidget.prototype.activate = function () {
+		this.calendar.resetUI();
 		this.$element.addClass( 'mw-widget-dateInputWidget-active' );
 		this.handle.toggle( false );
 		this.textInput.toggle( true );