jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347636 )
Change subject: Remove beta specific search behavioural changes
......................................................................
Remove beta specific search behavioural changes
With these changes the flicker free search optimisation
will ride the MediaWiki train.
Changes:
* Remove special handling for beta and make it the
default
* Adjustments to CSS to center spinner in search
display. Note the flicker free search change predates the
new header so was not compatible.
Bug: T153973
Change-Id: I740678fd5aa4228fc0378da2f915e92bd9a9c0a5
---
M resources/mobile.search/SearchOverlay.js
M resources/mobile.search/SearchOverlay.less
M resources/mobile.search/content.hogan
3 files changed, 36 insertions(+), 60 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.search/SearchOverlay.js
b/resources/mobile.search/SearchOverlay.js
index 1d9d711..f81cd7d 100644
--- a/resources/mobile.search/SearchOverlay.js
+++ b/resources/mobile.search/SearchOverlay.js
@@ -6,9 +6,9 @@
Icon = M.require( 'mobile.startup/Icon' ),
WatchstarPageList = M.require(
'mobile.pagelist.scripts/WatchstarPageList' ),
SEARCH_DELAY = 300,
+ SEARCH_SPINNER_DELAY = 2000,
$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 +89,7 @@
href: feedbackLink
} ).options,
prompt: mw.msg(
'mobile-frontend-search-feedback-prompt' )
- },
- isBeta: isBeta
+ }
} ),
/**
* @inheritdoc
@@ -261,30 +260,17 @@
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();
- } );
- }
+ }, SEARCH_SPINNER_DELAY - searchData.delay );
+ } );
+ M.on( 'search-results', clearSearch );
// Hide the clear button if the search input is empty
if ( self.$input.val() === '' ) {
diff --git a/resources/mobile.search/SearchOverlay.less
b/resources/mobile.search/SearchOverlay.less
index 86aa4b7..8754195 100644
--- a/resources/mobile.search/SearchOverlay.less
+++ b/resources/mobile.search/SearchOverlay.less
@@ -13,8 +13,23 @@
.search-overlay {
background: #fff;
- .spinner {
+ .spinner-container {
+ background-color: @colorSpinnerOverlayBackground;
+ bottom: 0;
display: none;
+ left: 0;
+ opacity: 0.7;
+ right: 0;
+ top: @headerHeight;
+ z-index: @z-indexOverOverlay;
+
+ .spinner {
+ display: block;
+ left: 50%;
+ margin-left: -( @iconSize + @iconGutterWidth * 2 ) / 2;
+ position: absolute;
+ top: 10%;
+ }
}
.search-box {
@@ -53,6 +68,7 @@
}
.overlay-content {
+ position: relative;
// used to close the overlay in firefox
height: 100%;
width: 100%;
@@ -179,38 +195,12 @@
}
}
-.beta {
- .search-overlay {
- .overlay-content {
- position: relative;
- }
-
- .spinner-container {
- background-color: @colorSpinnerOverlayBackground;
- bottom: 0;
- display: none;
- left: 0;
- opacity: 0.7;
- right: 0;
- top: @headerHeight;
- z-index: @z-indexOverOverlay;
-
- .spinner {
- display: block;
- left: 50%;
- margin-left: -( @iconSize + @iconGutterWidth *
2 ) / 2;
- position: absolute;
- top: 10%;
- }
- }
- }
-}
-
@media all and ( min-width: @deviceWidthTablet ) {
.search-overlay {
.search-box {
display: table-cell;
}
+ .spinner-container,
.search-content,
.results {
width: @searchBoxWidth;
@@ -222,6 +212,11 @@
padding-left: (@iconSize + 2 * @iconGutterWidth) +
@brandingBoxWidth;
}
+ .spinner-container {
+ left: auto;
+ right: auto;
+ }
+
ul {
width: auto;
}
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: merged
Gerrit-Change-Id: I740678fd5aa4228fc0378da2f915e92bd9a9c0a5
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
