From: Ed Sanders <esanders@wikimedia.org>
Date: Sun, 1 Oct 2017 12:14:40 +0000 (+0100)
Subject: TitleWidget: Use OOUI query highlighting, instead of jQuery lib
X-Git-Tag: 1.31.0-rc.0~1891^2~1
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=023979a3d8f292306706c8862ee21744844b4438;p=lhc%2Fweb%2Fwiklou.git

TitleWidget: Use OOUI query highlighting, instead of jQuery lib

Change-Id: I75ee7b3da74bdf9638c442322b699d22b4fee74c
---

diff --git a/resources/Resources.php b/resources/Resources.php
index f9590ec8b2..235bb59ca5 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2398,8 +2398,6 @@ return [
 			'mediawiki.Title',
 			'mediawiki.api',
 			'jquery.byteLimit',
-			// TitleOptionWidget
-			'jquery.highlightText',
 		],
 		'messages' => [
 			// NamespaceInputWidget
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
index 51508ab527..0f1815b004 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
@@ -21,7 +21,7 @@
 	 * @cfg {boolean} [missing] Page doesn't exist
 	 * @cfg {boolean} [redirect] Page is a redirect
 	 * @cfg {boolean} [disambiguation] Page is a disambiguation page
-	 * @cfg {string} [query] Matching query string
+	 * @cfg {string} [query] Matching query string to highlight
 	 */
 	mw.widgets.TitleOptionWidget = function MwWidgetsTitleOptionWidget( config ) {
 		var icon;
@@ -65,9 +65,10 @@
 		} );
 
 		// Highlight matching parts of link suggestion
-		this.$label
-			.highlightText( config.query )
-			.attr( 'title', config.data );
+		if ( config.query ) {
+			this.setHighlightedQuery( config.data, config.query );
+		}
+		this.$label.attr( 'title', config.data );
 
 		if ( config.missing ) {
 			this.$label.addClass( 'new' );