scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-22 16:06:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3628 from artoscinote/ma_SCI_6086

Browse source 
Close saved filters dropdown on outclick [SCI-6086]
This commit is contained in:
Alex Kriuchykhin 2021-11-08 21:02:01 +01:00 committed by GitHub
parent 5960582105 2f56e25346
commit 9355e7eddd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/packs/vue/bmt_filter.js
View file

@ -57,6 +57,11 @@ window.initBMTFilter = () => {
// prevent closing of dropdown
$('#bmtFilterContainer').on('click', (e) => e.stopPropagation());
// close saved filters dropdown
$('#bmtFiltersDropdownButton').on('hidden.bs.dropdown', (e) => {
$('.saved-filters-container').removeClass('open');
});
$("#saveBmtFilterForm" )
.off()
.on('ajax:before', function() {

13
app/javascript/vue/bmt_filter/container.vue
View file

@ -1,8 +1,8 @@
<template>
<div class="filter-container">
<div class="header">
<div class="dropdown saved-filters-container">
<div class="title" @click="toggleSavedFilters">
<div id="savedFiltersContainer" class="dropdown saved-filters-container" @click="toggleSavedFilters">
<div class="title" id="savedFilterDropdown">
{{ i18n.t('repositories.show.bmt_search.title') }}
<i v-if="savedFilters.length" class="fas fa-caret-down"></i>
</div>
@ -16,12 +16,12 @@
/>
</div>
</div>
<button class="btn btn-light" @click="clearFilters">
<button class="btn btn-light" @click="closeSavedFilters() && clearFilters()">
<i class="fas fa-times-circle"></i>
{{ i18n.t('repositories.show.bmt_search.clear_all') }}
</button>
</div>
<div class="filters-list">
<div class="filters-list" @click="closeSavedFilters">
<div v-if="filters.length == 0" class="filter-list-notice">
{{ i18n.t('repositories.show.bmt_search.no_filters') }}
</div>
@ -34,7 +34,7 @@
@filter:update="updateFilter"
/>
</div>
<div class="footer">
<div class="footer" @click="closeSavedFilters">
<button class="btn btn-light add-filter" @click="addFilter">
<i class="fas fa-plus"></i>
{{ i18n.t('repositories.show.bmt_search.add_filter') }}
@ -122,6 +122,9 @@
}
});
},
closeSavedFilters() {
$('.saved-filters-container').removeClass('open');
},
toggleSavedFilters() {
$('.saved-filters-container').toggleClass('open');
},

2
app/views/repositories/_toolbar_buttons.html.erb
View file

@ -86,7 +86,7 @@
<% end %>
</div>
<% if @repository.is_a?(BmtRepository) %>
<div class="dropdown">
<div class="dropdown" id="bmtFiltersDropdownButton">
<button id="bmtFiltersDropdown"
class="btn btn-secondary bmt-filters-button"
type="button"