golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop Android2 check for search 

Android2 is a grade C browser so this code will never be run in
MediaWiki.

Change-Id: I184df4fbea3743d54b24e3782c4d1debf7ff9095
This commit is contained in:
jdlrobson 2017-08-28 15:13:10 -05:00
parent ac74369848
commit 1dd2971124
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
resources/skins.minerva.scripts/search.js
View File

@ -2,8 +2,7 @@
var SearchOverlay = M.require( 'mobile.search/SearchOverlay' ), var SearchOverlay = M.require( 'mobile.search/SearchOverlay' ),
SearchGateway = M.require( 'mobile.search.api/SearchGateway' ), SearchGateway = M.require( 'mobile.search.api/SearchGateway' ),
router = require( 'mediawiki.router' ), router = require( 'mediawiki.router' ),
searchLogger = M.require( 'mobile.search/MobileWebSearchLogger' ), searchLogger = M.require( 'mobile.search/MobileWebSearchLogger' );
browser = M.require( 'mobile.startup/Browser' ).getSingleton();
/** /**
* Reveal the search overlay * Reveal the search overlay
@ -39,18 +38,13 @@
return; return;
} }
// See https://phabricator.wikimedia.org/T76882 for why we disable search on Android 2 // don't use focus event (https://bugzilla.wikimedia.org/show_bug.cgi?id=47499)
if ( browser.isAndroid2() ) { //
$( 'body' ).addClass( 'client-use-basic-search' ); // focus() (see SearchOverlay#show) opens virtual keyboard only if triggered
} else { // from user context event, so using it in route callback won't work
// don't use focus event (https://bugzilla.wikimedia.org/show_bug.cgi?id=47499) // http://stackoverflow.com/questions/6837543/show-virtual-keyboard-on-mobile-phones-in-javascript
// $( '#searchInput, #searchIcon' ).on( 'click', openSearchOverlay )
// focus() (see SearchOverlay#show) opens virtual keyboard only if triggered // Apparently needed for main menu to work correctly.
// from user context event, so using it in route callback won't work .prop( 'readonly', true );
// http://stackoverflow.com/questions/6837543/show-virtual-keyboard-on-mobile-phones-in-javascript
$( '#searchInput, #searchIcon' ).on( 'click', openSearchOverlay )
// Apparently needed for main menu to work correctly.
.prop( 'readonly', true );
}
}( mw.mobileFrontend, jQuery ) ); }( mw.mobileFrontend, jQuery ) );