From f3a682b138fb7dc34b92d125d017194228ece4ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Tue, 13 Oct 2015 14:24:36 +0200 Subject: [PATCH] OOjs UI: Backport aadaa8a1, 9aba218a Important tweaks for mw.widgets.CategorySelector, which will rise to prominence soon when we deploy mw.Upload.BookletLayout in VisualEditor. Bug: T114945 Bug: T115010 Change-Id: I4236a7c64469faa7476bcab9bd0a0f8497101fe2 --- resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css | 10 +++++++++- resources/lib/oojs-ui/oojs-ui.js | 11 +++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css index 4b65ad4fa0..08edbc66f0 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css @@ -1,3 +1,11 @@ +/* + * Local backports: + * + * - aadaa8a187d36ded603eebbdff47efe133908f6c + * CapsuleMultiSelectWidget: Set 'background-color' rather than 'background' + * Required for mw.widgets.CategorySelector's pending state to display. + */ + /*! * OOjs UI v0.12.11 * https://www.mediawiki.org/wiki/OOjs_UI @@ -2519,7 +2527,7 @@ width: 100%; } .oo-ui-capsuleMultiSelectWidget-handle { - background: #ffffff; + background-color: #ffffff; cursor: text; min-height: 2.4em; margin-right: 0.5em; diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index e433e91931..951acc7f9c 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,3 +1,11 @@ +/* + * Local backports: + * + * - 9aba218a882ff45b07410a3ce9d5cdfd8e567e26 + * CapsuleMultiSelectWidget: When 'allowArbitrary' is true, don't require 'Enter' to confirm + * Required for more intuitive behavior of mw.widgets.CategorySelector. + */ + /*! * OOjs UI v0.12.11 * https://www.mediawiki.org/wiki/OOjs_UI @@ -13455,6 +13463,9 @@ OO.ui.CapsuleMultiSelectWidget.prototype.onInputFocus = function () { * @param {jQuery.Event} event */ OO.ui.CapsuleMultiSelectWidget.prototype.onInputBlur = function () { + if ( this.allowArbitrary && this.$input.val().trim() !== '' ) { + this.addItemsFromData( [ this.$input.val() ] ); + } this.clearInput(); }; -- 2.20.1