IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Close search menu after advanced search is clicked (#26108)

Browse Source
This commit is contained in:
Isaac Janzen 2024-03-08 15:34:11 -07:00 committed by GitHub
parent f71e9aad60
commit 9484174f32
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/components/search-menu.hbs
View File

@ -46,7 +46,9 @@
{{#if this.search.activeGlobalSearchTerm}} {{#if this.search.activeGlobalSearchTerm}}
<SearchMenu::ClearButton @clearSearch={{this.clearSearch}} /> <SearchMenu::ClearButton @clearSearch={{this.clearSearch}} />
{{/if}} {{/if}}
<SearchMenu::AdvancedButton @href={{this.advancedSearchButtonHref}} /> <SearchMenu::AdvancedButton
@openAdvancedSearch={{this.openAdvancedSearch}}
/>
</div> </div>
{{/if}} {{/if}}
</div> </div>

6
app/assets/javascripts/discourse/app/components/search-menu.js
View File

@ -146,8 +146,10 @@ export default class SearchMenu extends Component {
return getURL(url); return getURL(url);
} }
get advancedSearchButtonHref() { @action
return this.fullSearchUrl({ expanded: true }); openAdvancedSearch() {
this.fullSearch();
this.close();
} }
get displayMenuPanelResults() { get displayMenuPanelResults() {

9
app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs
View File

@ -1,7 +1,6 @@
<a <DButton
class="show-advanced-search" class="show-advanced-search"
title={{i18n "search.open_advanced"}} title={{i18n "search.open_advanced"}}
href={{@href}} @action={{@openAdvancedSearch}}
> @icon="sliders-h"
{{d-icon "sliders-h"}} />
</a>

4
app/assets/javascripts/discourse/tests/acceptance/search-test.js
View File

@ -90,6 +90,10 @@ acceptance("Search - Anonymous", function (needs) {
"it goes to full search page and preserves the search term" "it goes to full search page and preserves the search term"
); );
assert
.dom(".search-menu .search-menu-panel")
.doesNotExist("closes search menu after clicking advanced search button");
assert.ok( assert.ok(
exists(".search-advanced-options"), exists(".search-advanced-options"),
"advanced search is expanded" "advanced search is expanded"

2
app/assets/stylesheets/common/base/search-menu.scss
View File

@ -350,7 +350,7 @@ $search-pad-horizontal: 0.5em;
margin-top: 2px; margin-top: 2px;
} }
a.show-advanced-search, .show-advanced-search,
a.clear-search { a.clear-search {
padding: 0px 3px; padding: 0px 3px;
display: inline-block; display: inline-block;