diff --git a/app/assets/javascripts/dashboard/current_tasks.js b/app/assets/javascripts/dashboard/current_tasks.js index c539aa9f3..b1a36e6e5 100644 --- a/app/assets/javascripts/dashboard/current_tasks.js +++ b/app/assets/javascripts/dashboard/current_tasks.js @@ -117,7 +117,6 @@ var DasboardCurrentTasksWidget = (function() { } } appendTasksList(result, '.current-tasks-list-wrapper'); - PerfectSb().update_all(); InfiniteScroll.init('.current-tasks-list-wrapper', { url: $currentTasksList.data('tasksListUrl'), diff --git a/app/assets/javascripts/dashboard/recent_work.js b/app/assets/javascripts/dashboard/recent_work.js index 2e57b1b01..b25c36826 100644 --- a/app/assets/javascripts/dashboard/recent_work.js +++ b/app/assets/javascripts/dashboard/recent_work.js @@ -32,8 +32,6 @@ var DasboardRecentWorkWidget = (function() { } else { container.append($('#recent-work-no-results-template').html()); } - - PerfectSb().update_all(); }); } diff --git a/app/assets/javascripts/sitewide/dropdown_selector.js b/app/assets/javascripts/sitewide/dropdown_selector.js index c178e3245..d6c2d7d32 100644 --- a/app/assets/javascripts/sitewide/dropdown_selector.js +++ b/app/assets/javascripts/sitewide/dropdown_selector.js @@ -1,4 +1,4 @@ -/* global PerfectScrollbar activePSB PerfectSb I18n */ +/* global I18n */ /* eslint-disable no-unused-vars, no-use-before-define */ /* @@ -301,7 +301,6 @@ var dropdownSelector = (function() { function generateDropdown(selector, config = {}) { var selectElement = $(selector); var optionContainer; - var perfectScroll; var dropdownContainer; var toggleElement; @@ -410,10 +409,6 @@ var dropdownSelector = (function() { } }); - // Initialize scroll bar inside options container - perfectScroll = new PerfectScrollbar(dropdownContainer.find('.dropdown-container')[0]); - activePSB.push(perfectScroll); - // Select options container optionContainer = dropdownContainer.find('.dropdown-container'); @@ -450,7 +445,6 @@ var dropdownSelector = (function() { if (dropdownContainer.hasClass('open')) { // Each time we open option container we must scroll it dropdownContainer.find('.dropdown-container').scrollTop(0); - PerfectSb().update_all(); // on Open we load new data loadData(selectElement, dropdownContainer); @@ -652,9 +646,6 @@ var dropdownSelector = (function() { $(`
${I18n.t('dropdown_selector.nothing_found')}
`).appendTo(container.find('.dropdown-container')); } - // Update scrollbar - PerfectSb().update_all(); - // Check position of option dropdown refreshDropdownSelection(selector, container); @@ -865,7 +856,6 @@ var dropdownSelector = (function() { }].concat(optionsAjax); } loadData(selector, container, optionsAjax); - PerfectSb().update_all(); }); // For local options we convert options element from select to correct array } else if (selector.data('select-by-group')) { diff --git a/app/assets/stylesheets/dashboard/recent_work.scss b/app/assets/stylesheets/dashboard/recent_work.scss index d4424e4f7..aa0ffe90c 100644 --- a/app/assets/stylesheets/dashboard/recent_work.scss +++ b/app/assets/stylesheets/dashboard/recent_work.scss @@ -8,6 +8,7 @@ .recent-work-container { height: 100%; + overflow-y: auto; padding: 0 8px; position: relative; diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss index e3c918061..b299b6897 100644 --- a/app/assets/stylesheets/global_activities.scss +++ b/app/assets/stylesheets/global_activities.scss @@ -155,6 +155,7 @@ .activities-container { height: 100%; + overflow-y: auto; padding-top: 10px; position: absolute; width: 100%; @@ -284,6 +285,7 @@ .filters-container { height: 100%; margin-bottom: 60px; + overflow-y: auto; padding: 15px 20px; position: absolute; } diff --git a/app/assets/stylesheets/shared/dropdown_selector.scss b/app/assets/stylesheets/shared/dropdown_selector.scss index a272ab601..2fe5b69c9 100644 --- a/app/assets/stylesheets/shared/dropdown_selector.scss +++ b/app/assets/stylesheets/shared/dropdown_selector.scss @@ -135,7 +135,7 @@ bottom: calc(100% - 30px); box-shadow: $flyout-shadow; display: none; - overflow: hidden; + overflow-y: auto; position: fixed; transition: .2s; transition-property: top, bottom, box-shadow; diff --git a/app/views/dashboards/_current_tasks.html.erb b/app/views/dashboards/_current_tasks.html.erb index 85f3a36bd..984f53451 100644 --- a/app/views/dashboards/_current_tasks.html.erb +++ b/app/views/dashboards/_current_tasks.html.erb @@ -76,7 +76,7 @@
-
+
diff --git a/app/views/dashboards/_recent_work.html.erb b/app/views/dashboards/_recent_work.html.erb index 588e73025..029bf677a 100644 --- a/app/views/dashboards/_recent_work.html.erb +++ b/app/views/dashboards/_recent_work.html.erb @@ -12,7 +12,7 @@
-
+
diff --git a/app/views/global_activities/index.html.erb b/app/views/global_activities/index.html.erb index f9a264889..e79326c84 100644 --- a/app/views/global_activities/index.html.erb +++ b/app/views/global_activities/index.html.erb @@ -7,7 +7,7 @@
-
+

<%= t('activities.index.no_activities_message') %>

@@ -24,7 +24,7 @@
-
+
<%= render partial: "side_filters" %>