From: Kunal Mehta <legoktm@member.fsf.org>
Date: Sat, 17 Dec 2016 00:09:02 +0000 (-0800)
Subject: SearchInputWidget: Support searching a namespaces besides 0
X-Git-Tag: 1.31.0-rc.0~4538^2
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=8f52f912f37f397c09748ddfe83d7214dcf73dd9;p=lhc%2Fweb%2Fwiklou.git

SearchInputWidget: Support searching a namespaces besides 0

0 is currently hardcoded in searchSuggest, making it hard to use
SearchInputWidget for other things.

SearchInputWidget already takes a namespace parameter by virtue of
extending TitleInputWidget, so use that.

Change-Id: Iecf93d1e8d4075a5a9aa0f08059c609aa8db4f6d
---

diff --git a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
index 2ac75c59f2..0a73befdf7 100755
--- a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
@@ -34,7 +34,8 @@
 			icon: 'search',
 			maxLength: undefined,
 			performSearchOnClick: true,
-			dataLocation: 'header'
+			dataLocation: 'header',
+			namespace: 0
 		}, config );
 
 		// Parent constructor
@@ -83,7 +84,7 @@
 			self = this;
 
 		// reuse the searchSuggest function from mw.searchSuggest
-		promise = mw.searchSuggest.request( api, this.getQueryValue(), $.noop, this.limit );
+		promise = mw.searchSuggest.request( api, this.getQueryValue(), $.noop, this.limit, this.getNamespace() );
 
 		// tracking purposes
 		promise.done( function ( data, jqXHR ) {
diff --git a/resources/src/mediawiki/mediawiki.searchSuggest.js b/resources/src/mediawiki/mediawiki.searchSuggest.js
index fa1a78c5cb..ce5f66a289 100644
--- a/resources/src/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/src/mediawiki/mediawiki.searchSuggest.js
@@ -4,12 +4,12 @@
 ( function ( mw, $ ) {
 	mw.searchSuggest = {
 		// queries the wiki and calls response with the result
-		request: function ( api, query, response, maxRows ) {
+		request: function ( api, query, response, maxRows, namespace ) {
 			return api.get( {
 				formatversion: 2,
 				action: 'opensearch',
 				search: query,
-				namespace: 0,
+				namespace: namespace || 0,
 				limit: maxRows,
 				suggest: true
 			} ).done( function ( data, jqXHR ) {