X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27votes%27%2C%20votes=%27waiting%27%29%20%7D%7D?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.widgets.datetime%2FDateTimeInputWidget.js;h=3e4c5e27671cf66db04fcd3b039768d2cef765c7;hb=e968a1f431ad058dcb14adb2757bde5664b99a79;hp=a3088ec5ca1fed4594a840905763799212f0d1b1;hpb=a946285e4d1b40ddb9374ae791a4aeb159eb7bb1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
index a3088ec5ca..3e4c5e2767 100644
--- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
+++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
@@ -177,7 +177,7 @@
 
 	/* Static properties */
 
-	mw.widgets.datetime.DateTimeInputWidget[ 'static' ].supportsSimpleLabel = false;
+	mw.widgets.datetime.DateTimeInputWidget.static.supportsSimpleLabel = false;
 
 	/* Events */
 
@@ -390,6 +390,10 @@
 				$field = $( '<span>' )
 					.width( sz )
 					.data( 'mw-widgets-datetime-dateTimeInputWidget-placeholder', placeholder );
+				if ( spec.type !== 'static' ) {
+					$field.prop( 'tabIndex', -1 );
+					$field.on( 'focus', this.onFieldFocus.bind( this, $field ) );
+				}
 				if ( spec.type === 'static' ) {
 					$field.text( spec.value );
 				} else {
@@ -583,6 +587,7 @@
 	 * @private
 	 * @param {jQuery} $field
 	 * @param {jQuery.Event} e Key down event
+	 * @return {boolean} False to cancel the default event
 	 */
 	mw.widgets.datetime.DateTimeInputWidget.prototype.onFieldKeyDown = function ( $field, e ) {
 		var spec = $field.data( 'mw-widgets-datetime-dateTimeInputWidget-fieldSpec' );
@@ -627,6 +632,8 @@
 	 * @param {jQuery.Event} e Focus event
 	 */
 	mw.widgets.datetime.DateTimeInputWidget.prototype.onFieldFocus = function ( $field ) {
+		var spec = $field.data( 'mw-widgets-datetime-dateTimeInputWidget-fieldSpec' );
+
 		if ( !this.isDisabled() ) {
 			if ( this.getValueAsDate() === null ) {
 				this.setValue( this.formatter.getDefaultDate() );
@@ -636,7 +643,7 @@
 			}
 
 			if ( this.calendar ) {
-				this.calendar.toggle( true );
+				this.calendar.toggle( !!spec.calendarComponent );
 			}
 		}
 	};
@@ -704,6 +711,7 @@
 	 * @private
 	 * @param {jQuery} $field
 	 * @param {jQuery.Event} e Change event
+	 * @return {boolean} False to cancel the default event
 	 */
 	mw.widgets.datetime.DateTimeInputWidget.prototype.onFieldWheel = function ( $field, e ) {
 		var delta = 0,