Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347636 )
Change subject: Deploy flicker free search
......................................................................
Deploy flicker free search
Bug: T153973
Change-Id: I740678fd5aa4228fc0378da2f915e92bd9a9c0a5
---
M resources/mobile.search/SearchOverlay.js
M resources/mobile.search/content.hogan
2 files changed, 23 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/36/347636/1
diff --git a/resources/mobile.search/SearchOverlay.js
b/resources/mobile.search/SearchOverlay.js
index 1d9d711..6500a78 100644
--- a/resources/mobile.search/SearchOverlay.js
+++ b/resources/mobile.search/SearchOverlay.js
@@ -7,8 +7,7 @@
WatchstarPageList = M.require(
'mobile.pagelist.scripts/WatchstarPageList' ),
SEARCH_DELAY = 300,
$html = $( 'html' ),
- feedbackLink = mw.config.get( 'wgCirrusSearchFeedbackLink' ),
- isBeta = M.require( 'mobile.startup/context'
).isBetaGroupMember();
+ feedbackLink = mw.config.get( 'wgCirrusSearchFeedbackLink' );
/**
* Overlay displaying search results
@@ -89,8 +88,7 @@
href: feedbackLink
} ).options,
prompt: mw.msg(
'mobile-frontend-search-feedback-prompt' )
- },
- isBeta: isBeta
+ }
} ),
/**
* @inheritdoc
@@ -261,30 +259,28 @@
clearTimeout( timer );
}
- if ( isBeta ) {
- // Show a spinner on top of search results
- this.$spinner = this.$( '.spinner-container' );
- M.on( 'search-start', function ( searchData ) {
- if ( timer ) {
- clearSearch();
- }
- timer = setTimeout( function () {
- self.$spinner.show();
- }, 2000 - searchData.delay );
- } );
- M.on( 'search-results', clearSearch );
- } else {
- // Show a spinner in place search results
- this.$spinner = this.$( '.spinner' );
- M.on( 'search-start', function () {
- self.resetSearch();
+ // Show a spinner on top of search results
+ this.$spinner = this.$( '.spinner-container' );
+ M.on( 'search-start', function ( searchData ) {
+ if ( timer ) {
+ clearSearch();
+ }
+ timer = setTimeout( function () {
self.$spinner.show();
- } );
- M.on( 'search-results', function () {
- self.$searchFeedback.show();
- self.$spinner.hide();
- } );
- }
+ }, 2000 - searchData.delay );
+ } );
+ M.on( 'search-results', clearSearch );
+ } else {
+ // Show a spinner in place search results
+ this.$spinner = this.$( '.spinner' );
+ M.on( 'search-start', function () {
+ self.resetSearch();
+ self.$spinner.show();
+ } );
+ M.on( 'search-results', function () {
+ self.$searchFeedback.show();
+ self.$spinner.hide();
+ } );
// Hide the clear button if the search input is empty
if ( self.$input.val() === '' ) {
diff --git a/resources/mobile.search/content.hogan
b/resources/mobile.search/content.hogan
index 006fc40..20d0545 100644
--- a/resources/mobile.search/content.hogan
+++ b/resources/mobile.search/content.hogan
@@ -8,14 +8,9 @@
<p class="without-results">{{{searchContentNoResultsMsg}}}</p>
</div>
</div>
-{{^isBeta}}
- {{{spinner}}}
-{{/isBeta}}
-{{#isBeta}}
<div class="spinner-container position-fixed">
{{{spinner}}}
</div>
-{{/isBeta}}
<div class="results">
<div class="results-list-container"></div>
{{#feedback}}
--
To view, visit https://gerrit.wikimedia.org/r/347636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I740678fd5aa4228fc0378da2f915e92bd9a9c0a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
