diff --git a/resources/dist/mobile.startup.js b/resources/dist/mobile.startup.js index 0c7ec98776c3ae0ef7b8f932ce6358bca5fb8e42..fd2540e4bbdaf946edf50114cfe2f1947e3798f1 100644 Binary files a/resources/dist/mobile.startup.js and b/resources/dist/mobile.startup.js differ diff --git a/resources/dist/mobile.startup.js.map.json b/resources/dist/mobile.startup.js.map.json index 0b4246097fa9d485a0bce94382383ea290224209..48dfe1d4b35b3f5a9e43077cc65d7e3de3f46c6d 100644 Binary files a/resources/dist/mobile.startup.js.map.json and b/resources/dist/mobile.startup.js.map.json differ diff --git a/src/mobile.startup/search/SearchHeaderView.js b/src/mobile.startup/search/SearchHeaderView.js index 34ea195f64e8567489dfa21ae97f671f8a74ffbb..cc940a632a99cedc13381c1c09b6134e2c84a00c 100644 --- a/src/mobile.startup/search/SearchHeaderView.js +++ b/src/mobile.startup/search/SearchHeaderView.js @@ -44,6 +44,7 @@ class SearchHeaderView extends View { return util.template( `<div class="overlay-title search-header-view"> <form method="get" action="{{action}}" class="search-box"> <input class="search mw-ui-background-icon-search" type="search" name="search" autocomplete="off" placeholder="{{placeholderMsg}}" aria-label="{{placeholderMsg}}" value="{{searchTerm}}"> + <input type="hidden" name="title" value="{{defaultSearchPage}}"> </form> </div>` ); } diff --git a/src/mobile.startup/search/SearchOverlay.js b/src/mobile.startup/search/SearchOverlay.js index 1507c6902e5435f695e736b9555a83080ce34787..e1626a41e849a81be2cb7e38699f1f1f909edf05 100644 --- a/src/mobile.startup/search/SearchOverlay.js +++ b/src/mobile.startup/search/SearchOverlay.js @@ -19,6 +19,7 @@ var * @param {Object} params Configuration options * @param {string} params.placeholderMsg Search input placeholder text. * @param {string} [params.action] of form defaults to the value of wgScript + * @param {string} [params.defaultSearchPage] The default search page e.g. Special:Search * @param {SearchGateway} [params.gateway] * @fires SearchOverlay#search-show * @fires SearchOverlay#search-start @@ -31,7 +32,8 @@ function SearchOverlay( params ) { params.action || mw.config.get( 'wgScript' ), function ( query ) { this.performSearch( query ); - }.bind( this ) + }.bind( this ), + params.defaultSearchPage || '' ), options = util.extend( true, { headerChrome: true, diff --git a/src/mobile.startup/search/searchHeader.js b/src/mobile.startup/search/searchHeader.js index c06503c9b8a65de0edb8c2f98eaad01fb937ff05..b924ddc2652c7c3464ac8191fc4c11efb67200fa 100644 --- a/src/mobile.startup/search/searchHeader.js +++ b/src/mobile.startup/search/searchHeader.js @@ -8,14 +8,16 @@ const formHeader = require( '../headers' ).formHeader, * @param {string} placeholderMsg * @param {string} action * @param {Function} onInput + * @param {string} defaultSearchPage * @return {jQuery.Element} */ -function searchHeader( placeholderMsg, action, onInput ) { +function searchHeader( placeholderMsg, action, onInput, defaultSearchPage ) { return formHeader( new SearchHeaderView( { placeholderMsg, action, - onInput + onInput, + defaultSearchPage } ), [ icons.cancel()