Merge "Revert "Use searchFooterText slot in typeahead search component""

i18n/en.json

@@ -30,7 +30,6 @@
 	"vector-jumptocontent": "Jump to content",
 	"vector-more-actions": "More",
 	"vector-search-loader": "Loading search suggestions",
-	"vector-searchsuggest-containing": "Search for pages containing <strong class=\"wvui-typeahead-search__suggestions__footer__text__query\">$1</strong>",
 	"vector-intro-page": "Help:Introduction",
 	"vector-anon-user-menu-pages": "Pages for logged out editors",
 	"vector-anon-user-menu-pages-learn": "learn more",

i18n/qqq.json

@@ -39,7 +39,6 @@
 	"vector-view-viewsource": "Tab label in the Vector skin.\n{{Identical|View source}}",
 	"vector-jumptonavigation": "Accessibility link for jumping to the navigation links. Visually hidden by default.\n\nSee also\n* {{msg-mw|Navigation}}",
 	"vector-jumptosearch": "Accessibility link for jumping to the site search. Visually hidden by default.\n\nSee also\n* {{msg-mw|Search}}",
-	"vector-searchsuggest-containing": "Label used in the special item of the search suggestions list which gives the user an option to perform a full text search for the term. Used in the WVUI typeahead search component.",
 	"vector-jumptocontent": "Accessibility link for jumping to the content and skipping the navigation. Visually hidden by default.",
 	"vector-more-actions": "Label in the Vector skin's menu for the less-important or rarer actions which are not shown as tabs (like moving the page, or for sysops deleting or protecting the page), as well as (for users with a narrow viewing window in their browser) the less-important tab actions which the user's browser is unable to fit in. {{Identical|More}}",
 	"vector-search-loader": "Text to display below search input while the search suggestion module is loading",

resources/skins.vector.search/App.vue

@@ -4,6 +4,7 @@
 		ref="searchForm"
 		:client="getClient"
 		:domain="domain"
+		:footer-search-text="$i18n( 'searchsuggest-containing' ).text()"
 		:suggestions-label="$i18n( 'searchresults' ).text()"
 		:accesskey="searchAccessKey"
 		:title="searchTitle"
@@ -22,19 +23,14 @@
 		@suggestion-click="instrumentation.onSuggestionClick"
 		@submit="onSubmit"
 	>
-		<template #default>
+		<input type="hidden"
-			<input type="hidden"
+			name="title"
-				name="title"
+			:value="searchPageTitle"
-				:value="searchPageTitle"
+		>
-			>
+		<input type="hidden"
-			<input type="hidden"
+			name="wprov"
-				name="wprov"
+			:value="wprov"
-				:value="wprov"
+		>
-			>
-		</template>
-		<template #search-footer-text="{ searchQuery }">
-			<span v-i18n-html:vector-searchsuggest-containing="[ searchQuery ]"></span>
-		</template>
 	</wvui-typeahead-search>
 </template>
 

skin.json

@@ -105,7 +105,7 @@
 			"messages": [
 				"searchbutton",
 				"searchresults",
-				"vector-searchsuggest-containing"
+				"searchsuggest-containing"
 			]
 		},
 		"skins.vector.styles.legacy": {