From: Thiemo Mättig <thiemo.maettig@wikimedia.de>
Date: Fri, 14 Feb 2014 12:58:44 +0000 (+0100)
Subject: Performance of mediawiki.searchSuggest.js
X-Git-Tag: 1.31.0-rc.0~16915
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=c899b00f942ce8bff3ed416247e0120ceaebe693;p=lhc%2Fweb%2Fwiklou.git

Performance of mediawiki.searchSuggest.js

Two tiny performance improvements.

The complexity of a regular expression is not needed to check if a
string contains a character. string.match() returns an array of
matches which is not used anyway in this case. Either
string.indexOf() or RegExp.test() should be used.

Duplicate jQuery call merged.

Change-Id: Ifec79eada70181df0d56c583ef832ee82594620e
---

diff --git a/resources/mediawiki/mediawiki.searchSuggest.js b/resources/mediawiki/mediawiki.searchSuggest.js
index 3b360af386..8d950a0280 100644
--- a/resources/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/mediawiki/mediawiki.searchSuggest.js
@@ -32,13 +32,13 @@
 
 		// Compute form data for search suggestions functionality.
 		function computeResultRenderCache( context ) {
-			var $form, formAction, baseHref, linkParams;
+			var $form, baseHref, linkParams;
 
 			// Compute common parameters for links' hrefs
 			$form = context.config.$region.closest( 'form' );
 
-			formAction = $form.attr( 'action' );
-			baseHref = formAction + ( formAction.match( /\?/ ) ? '&' : '?' );
+			baseHref = $form.attr( 'action' );
+			baseHref += baseHref.indexOf( '?' ) > -1 ? '&' : '?';
 
 			linkParams = {};
 			$.each( $form.serializeArray(), function ( idx, obj ) {
@@ -185,10 +185,9 @@
 			special: {
 				render: specialRenderFunction,
 				select: function ( $input ) {
-					$input.closest( 'form' ).append(
-						$( '<input type="hidden" name="fulltext" value="1"/>' )
-					);
-					$input.closest( 'form' ).submit();
+					$input.closest( 'form' )
+						.append( $( '<input type="hidden" name="fulltext" value="1"/>' ) )
+						.submit();
 				}
 			},
 			$region: $searchRegion