scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-04 03:36:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3183 from urbanrotnik/ur-sci-5519

Browse source 
Fix projects filter [SCI-5519]
This commit is contained in:
Miha Mencin 2021-02-23 13:43:04 +01:00 committed by GitHub
commit d1b16ebf01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/projects/index.js
View file

@ -641,6 +641,10 @@ var ProjectsIndex = (function() {
$('#folderSearchInfo').toggle(); $('#folderSearchInfo').toggle();
}); });
$projectsFilter.on('click', '#folder_search', function(e) {
e.stopPropagation();
});
$filterDropdown.on('filter:apply', function() { $filterDropdown.on('filter:apply', function() {
createdOnFromFilter = selectDate($createdOnFromFilter); createdOnFromFilter = selectDate($createdOnFromFilter);
createdOnToFilter = selectDate($createdOnToFilter); createdOnToFilter = selectDate($createdOnToFilter);

10
app/assets/javascripts/sitewide/filter_dropdown.js
View file

@ -10,8 +10,8 @@ var filterDropdown = (function() {
} }
function preventDropdownClose() { function preventDropdownClose() {
$('.dropdown-menu', $filterContainer).click((e) => { $filterContainer.on('click', '.dropdown-menu', function(e) {
if (!$(e.target).is('input,a,.keyword-text,.keyword-icon')) { if (!$(e.target).is('input,a')) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
$('#textSearchFilterHistory').hide(); $('#textSearchFilterHistory').hide();
@ -35,7 +35,7 @@ var filterDropdown = (function() {
$('#textSearchFilterHistory').append( $('#textSearchFilterHistory').append(
$(`<li class="dropdown-item"> $(`<li class="dropdown-item">
<a class="projects-search-keyword" href="#" data-keyword="${keyword}"> <a class="projects-search-keyword" href="#" data-keyword="${keyword}">
<i class="fas fa-history keyword-icon"></i> <i class="fas fa-history"></i>
<span class="keyword-text">${keyword}</span> <span class="keyword-text">${keyword}</span>
</a> </a>
</li>`) </li>`)
@ -58,10 +58,6 @@ var filterDropdown = (function() {
$(this).closest('.dropdown').removeClass('open'); $(this).closest('.dropdown').removeClass('open');
}); });
$textFilter.on('focusout', function() {
$filterContainer.trigger('filter:clickBody');
});
$filterContainer.on('click', '.projects-search-keyword', function(e) { $filterContainer.on('click', '.projects-search-keyword', function(e) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();