jenkins-bot has submitted this change and it was merged.
Change subject: Split off adaptLetterCase and autocompleteString from suggester
......................................................................
Split off adaptLetterCase and autocompleteString from suggester
(requires change I83d751ca22f2b0579d21849233da011417b92e5d)
Change-Id: I8d865115608ef6d2ddb48897296147a69528f06d
---
M lib/resources/Resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
2 files changed, 15 insertions(+), 5 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 4396a4d..1405b87 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -679,9 +679,12 @@
'jquery.wikibase/themes/default/jquery.wikibase.entityselector.css'
),
'dependencies' => array(
+ 'jquery.autocompletestring',
+ 'jquery.eachchange',
'jquery.ui.suggester',
'jquery.ui.resizable',
- 'jquery.eachchange'
+ 'jquery.ui.widget',
+ 'jquery.util.adaptlettercase',
),
'messages' => array(
'wikibase-aliases-label',
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index 776eff6..d3d38ba 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -66,9 +66,11 @@
* Parameters: (1) {jQuery.Event}
* (2) {String} Entity id
*
+ * @dependency jquery.autocompletestring
* @dependency jquery.eachchange
* @dependency jquery.ui.suggester
* @dependency jquery.ui.resizable
+ * @dependency jquery.util.adaptlettercase
*/
( function( $, mw ) {
'use strict';
@@ -448,10 +450,15 @@
stringToAutocomplete =
firstMatch.aliases[0];
}
- this.autocompleteString(
- searchTerm,
- stringToAutocomplete
- );
+ if(
this.options.adaptLetterCase ) {
+ this.term = searchTerm
= $.util.adaptlettercase(
+ searchTerm,
+
stringToAutocomplete,
+
this.options.adaptLetterCase
+ );
+ }
+
+
this.element.autocompletestring( searchTerm, stringToAutocomplete );
if (
this.options.selectOnAutocomplete
--
To view, visit https://gerrit.wikimedia.org/r/74117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d865115608ef6d2ddb48897296147a69528f06d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
