diff --git a/app/assets/javascripts/experiments/table.js b/app/assets/javascripts/experiments/table.js index a835f6faa..fb531d855 100644 --- a/app/assets/javascripts/experiments/table.js +++ b/app/assets/javascripts/experiments/table.js @@ -11,6 +11,7 @@ var ExperimnetTable = { filters: [], // Filter {name: '', init(), closeFilter(), apply(), active(), clearFilter()} myModulesCurrentSort: '', pageSize: GLOBAL_CONSTANTS.DEFAULT_ELEMENTS_PER_PAGE, + provisioningStatusTimeout: '', getUrls: function(id) { return $(`.table-row[data-id="${id}"]`).data('urls'); }, @@ -589,7 +590,8 @@ var ExperimnetTable = { }); if (remainingUrls.length > 0) { - setTimeout(() => { + clearTimeout(this.provisioningStatusTimeout); + this.provisioningStatusTimeout = setTimeout(() => { this.pollProvisioningStatuses(remainingUrls); }, 10000); } else { diff --git a/app/assets/javascripts/sitewide/filter_dropdown.js b/app/assets/javascripts/sitewide/filter_dropdown.js index 46849a843..994b62d8f 100644 --- a/app/assets/javascripts/sitewide/filter_dropdown.js +++ b/app/assets/javascripts/sitewide/filter_dropdown.js @@ -44,18 +44,20 @@ var filterDropdown = (function() { } catch (error) { console.error(error); } - }).on('hide.bs.dropdown', function() { - $('#textSearchFilterHistory').hide(); - $('.apply-filters', $filterContainer).click(); + }).on('hide.bs.dropdown', function(e) { + if (e.target === e.currentTarget) { + $('#textSearchFilterHistory').hide(); + $('.apply-filters', $filterContainer).click(); + } }); $textFilter.click(function(e) { e.stopPropagation(); $('#textSearchFilterHistory').toggle(); - $(e.target).closest('.dropdown').toggleClass('open'); + $(e.currentTarget).closest('.dropdown').toggleClass('open'); }).on('input', (e) => { $('#textSearchFilterHistory').hide(); - $(e.target).closest('.dropdown').removeClass('open'); + $(e.currentTarget).closest('.dropdown').removeClass('open'); }); $filterContainer.on('click', '.projects-search-keyword', function(e) {