jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365242 )
Change subject: DateTimeInputWidget: Ignore wheel when not focused
......................................................................
DateTimeInputWidget: Ignore wheel when not focused
Much like I6c9f4679, it's probably best that the widget only use wheel
input when it's focused so it won't accidentally trigger when scrolling
through a form.
Bug: T170607
Change-Id: I46dc3eb01733be939c62e7e7f3f044f21ef1e6d8
---
M resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
1 file changed, 13 insertions(+), 3 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
index e42ab25..9233eef 100644
--- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
+++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
@@ -184,6 +184,16 @@
/* Methods */
/**
+ * Get the currently focused field, if any
+ *
+ * @private
+ * @return {jQuery}
+ */
+ mw.widgets.datetime.DateTimeInputWidget.prototype.getFocusedField =
function () {
+ return this.$fields.find(
this.getElementDocument().activeElement );
+ };
+
+ /**
* Convert a date string to a Date
*
* @private
@@ -717,7 +727,7 @@
var delta = 0,
spec = $field.data(
'mw-widgets-datetime-dateTimeInputWidget-fieldSpec' );
- if ( this.isDisabled() ) {
+ if ( this.isDisabled() || !this.getFocusedField().length ) {
return;
}
@@ -803,7 +813,7 @@
* @inheritdoc
*/
mw.widgets.datetime.DateTimeInputWidget.prototype.focus = function () {
- if ( !this.$fields.find( document.activeElement ).length ) {
+ if ( !this.getFocusedField().length ) {
this.$fields.find(
'.mw-widgets-datetime-dateTimeInputWidget-editField' ).first().focus();
}
return this;
@@ -813,7 +823,7 @@
* @inheritdoc
*/
mw.widgets.datetime.DateTimeInputWidget.prototype.blur = function () {
- this.$fields.find( document.activeElement ).blur();
+ this.getFocusedField().blur();
return this;
};
--
To view, visit https://gerrit.wikimedia.org/r/365242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46dc3eb01733be939c62e7e7f3f044f21ef1e6d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
