Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "DateInputWidget: Unbreak closing the calendar when selecting a date"

Browse source
This commit is contained in:
jenkins-bot 2017-07-17 19:47:01 +00:00 committed by Gerrit Code Review
commit ab14aaee1a
1 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
View file

@ -130,6 +130,7 @@
} );
this.inCalendar = 0;
this.inTextInput = 0;
this.closing = false;
this.inputFormat = config.inputFormat;
this.displayFormat = config.displayFormat;
this.longDisplayFormat = config.longDisplayFormat;
@ -173,7 +174,7 @@
this.$handle.on( {
click: this.onClick.bind( this ),
keypress: this.onKeyPress.bind( this ),
focus: this.activate.bind( this )
focus: this.onFocus.bind( this )
} );
// Initialization
@ -521,6 +522,17 @@
}
};
/**
* Handle focus events.
*
* @private
*/
mw.widgets.DateInputWidget.prototype.onFocus = function () {
if ( !this.closing ) {
this.activate();
}
};
/**
* Handle calendar key press events.
*
@ -530,8 +542,13 @@
*/
mw.widgets.DateInputWidget.prototype.onCalendarKeyPress = function ( e ) {
if ( !this.isDisabled() && e.which === OO.ui.Keys.ENTER ) {
// Prevent focusing the handle from reopening the calendar
this.closing = true;
this.deactivate();
this.$handle.focus();
this.closing = false;
return false;
}
};
@ -547,10 +564,18 @@
if (
!this.isDisabled() &&
e.which === 1 &&
$( e.target ).hasClass( 'mw-widget-calendarWidget-day' )
(
$( e.target ).hasClass( 'mw-widget-calendarWidget-day' ) ||
$( e.target ).hasClass( 'mw-widget-calendarWidget-month' )
)
) {
// Prevent focusing the handle from reopening the calendar
this.closing = true;
this.deactivate();
this.$handle.focus();
this.closing = false;
return false;
}
};
@ -561,8 +586,13 @@
* @private
*/
mw.widgets.DateInputWidget.prototype.onEnter = function () {
// Prevent focusing the handle from reopening the calendar
this.closing = true;
this.deactivate();
this.$handle.focus();
this.closing = false;
};
/**