Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252718
Change subject: WIP: Convert Special:Search input to OOUI
......................................................................
WIP: Convert Special:Search input to OOUI
Bug: T100898
Change-Id: I24801495dfad71f457bc4afdd28474f74b219024
---
M includes/specials/SpecialSearch.php
M resources/Resources.php
M resources/src/mediawiki.special/mediawiki.special.search.css
M resources/src/mediawiki.special/mediawiki.special.search.js
M resources/src/mediawiki/mediawiki.searchSuggest.js
5 files changed, 25 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/18/252718/1
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index 2f47add..0737a42 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -318,6 +318,7 @@
$num = $titleMatchesNum + $textMatchesNum;
$totalRes = $numTitleMatches + $numTextMatches;
+ $out->enableOOUI();
$out->addHtml(
# This is an awful awful ID name. It's not a table, but
we
# named it poorly from when this was a table so now
we're
@@ -1212,21 +1213,24 @@
* @return string
*/
protected function shortDialog( $term, $resultsShown, $totalNum ) {
- $out = Html::hidden( 'title',
$this->getPageTitle()->getPrefixedText() );
- $out .= Html::hidden( 'profile', $this->profile ) . "\n";
- // Term box
- $out .= Html::input( 'search', $term, 'search', array(
- 'id' => $this->isPowerSearch() ? 'powerSearchText' :
'searchText',
- 'size' => '50',
- 'autofocus' => trim( $term ) === '',
- 'class' => 'mw-ui-input mw-ui-input-inline',
- ) ) . "\n";
- $out .= Html::hidden( 'fulltext', 'Search' ) . "\n";
- $out .= Html::submitButton(
- $this->msg( 'searchbutton' )->text(),
- array( 'class' => 'mw-ui-button mw-ui-progressive' ),
- array( 'mw-ui-progressive' )
- ) . "\n";
+ $out =
+ Html::hidden( 'title',
$this->getPageTitle()->getPrefixedText() ) .
+ Html::hidden( 'profile', $this->profile ) .
+ Html::hidden( 'fulltext', 'Search' ) .
+ new MediaWiki\Widget\TitleInputWidget( array(
+ 'type' => 'search',
+ 'icon' => 'search',
+ 'id' => 'searchText',
+ 'name' => 'search',
+ 'flagEmpty' => false,
+ 'autofocus' => trim( $term ) === '',
+ 'value' => $term,
+ ) ) .
+ new OOUI\ButtonInputWidget( array(
+ 'type' => 'submit',
+ 'label' => $this->msg( 'searchbutton' )->text(),
+ 'flags' => array( 'progressive', 'primary' ),
+ ) );
// Results-info
if ( $totalNum > 0 && $this->offset < $totalNum ) {
diff --git a/resources/Resources.php b/resources/Resources.php
index fa04e41..c7bc748 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1740,6 +1740,7 @@
'position' => 'top',
'scripts' =>
'resources/src/mediawiki.special/mediawiki.special.search.js',
'styles' =>
'resources/src/mediawiki.special/mediawiki.special.search.css',
+ 'dependencies' => 'mediawiki.widgets',
'messages' => array(
'powersearch-togglelabel',
'powersearch-toggleall',
diff --git a/resources/src/mediawiki.special/mediawiki.special.search.css
b/resources/src/mediawiki.special/mediawiki.special.search.css
index 1ce9569..52ceb87 100755
--- a/resources/src/mediawiki.special/mediawiki.special.search.css
+++ b/resources/src/mediawiki.special/mediawiki.special.search.css
@@ -179,3 +179,6 @@
form#powersearch {
clear: both;
}
+#searchText {
+ display: inline-block;
+}
diff --git a/resources/src/mediawiki.special/mediawiki.special.search.js
b/resources/src/mediawiki.special/mediawiki.special.search.js
index 730119e..bb7ab53 100644
--- a/resources/src/mediawiki.special/mediawiki.special.search.js
+++ b/resources/src/mediawiki.special/mediawiki.special.search.js
@@ -33,7 +33,7 @@
// Change the header search links to what user entered
$headerLinks = $( '.search-types a' );
- $( '#searchText, #powerSearchText' ).change( function () {
+ OO.ui.infuse( 'searchText' ).on( 'change', function (
searchterm ) {
var searchterm = $( this ).val();
$headerLinks.each( function () {
var parts = $( this ).attr( 'href' ).split(
'search=' ),
@@ -46,7 +46,7 @@
}
this.href = parts[ 0 ] + prefix +
encodeURIComponent( searchterm ) + lastpart;
} );
- } ).trigger( 'change' );
+ } );
// When saving settings, use the proper request method (POST
instead of GET).
$( '#mw-search-powersearch-remember' ).change( function () {
diff --git a/resources/src/mediawiki/mediawiki.searchSuggest.js
b/resources/src/mediawiki/mediawiki.searchSuggest.js
index c960d65..22f9a19 100644
--- a/resources/src/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/src/mediawiki/mediawiki.searchSuggest.js
@@ -174,9 +174,6 @@
searchboxesSelectors = [
// Primary searchbox on every page in standard skins
'#searchInput',
- // Special:Search
- '#powerSearchText',
- '#searchText',
// Generic selector for skins with multiple searchboxes
(used by CologneBlue)
// and for MediaWiki itself (special pages with page
title inputs)
'.mw-searchInput'
--
To view, visit https://gerrit.wikimedia.org/r/252718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24801495dfad71f457bc4afdd28474f74b219024
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
