Skip to content

[stable20] Fix/unified search papercuts #22935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 5 commits into from
Sep 18, 2020
Merged

[stable20] Fix/unified search papercuts #22935

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2672f5d
Fix loading error catch
skjnldsv Sep 15, 2020
3c6319f
Properly use form role=search and unify reset button
skjnldsv Sep 15, 2020
839f597
Properly show loading state if there are still pending requests
skjnldsv Sep 15, 2020
5646144
Build assets and fix unified search event syntax
skjnldsv Sep 15, 2020
7ad9734
Prevent empty search placeholder
skjnldsv Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Properly show loading state if there are still pending requests 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv @backportbot
skjnldsv authored and backportbot[bot] committed Sep 18, 2020
commit 839f597921d00581151ac554ab800a9d20096313
10 changes: 9 additions & 1 deletion core/src/views/UnifiedSearch.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<div class="unified-search__input-wrapper">
<form class="unified-search__form"
role="search"
:class="{'icon-loading-small': isLoading}"
@submit.prevent.stop="onInputEnter"
@reset.prevent.stop="onReset">
<!-- Search input -->
Expand All @@ -48,7 +49,7 @@
@keypress.enter.prevent.stop="onInputEnter">

<!-- Reset search button -->
<input v-if="!!query"
<input v-if="!!query && !isLoading"
type="reset"
class="unified-search__form-reset icon-close"
:aria-label="t('core','Reset search')"
Expand Down Expand Up @@ -646,6 +647,12 @@ $input-padding: 6px;
width: 100%;
margin: $margin;

// Loading spinner
&::after {
right: $input-padding;
left: auto;
}

&-input,
&-reset {
margin: $input-padding / 2;
Expand Down Expand Up @@ -673,6 +680,7 @@ $input-padding: 6px;
}

// Ellipsis earlier if reset button is here
.icon-loading-small &,
&--with-reset {
padding-right: $input-height;
}
Expand Down