diff --git a/app/assets/javascripts/utilities/slideSidebar.js b/app/assets/javascripts/utilities/slideSidebar.js index 3656f655a..1c939ca08 100644 --- a/app/assets/javascripts/utilities/slideSidebar.js +++ b/app/assets/javascripts/utilities/slideSidebar.js @@ -2,23 +2,22 @@ function slideSidebar(side, direction) { if (!document.getElementById('sidebar-wrapper-' + side)) { return; } + const mainContent = + document.getElementById('main-content') || + document.getElementById('articles-list'); if (direction === 'intoView') { - document.getElementById('articles-list').classList.add('modal-open'); + mainContent.classList.add('modal-open'); document.body.classList.add('modal-open'); document .getElementById('sidebar-wrapper-' + side) .classList.add('swiped-in'); - document - .getElementById('articles-list') - .addEventListener('touchmove', preventDefaultAction, false); + mainContent.addEventListener('touchmove', preventDefaultAction, false); } else { - document.getElementById('articles-list').classList.remove('modal-open'); + mainContent.classList.remove('modal-open'); document.body.classList.remove('modal-open'); document .getElementById('sidebar-wrapper-' + side) .classList.remove('swiped-in'); - document - .getElementById('articles-list') - .removeEventListener('touchmove', preventDefaultAction, false); + mainContent.removeEventListener('touchmove', preventDefaultAction, false); } } diff --git a/app/views/articles/tag_index.html.erb b/app/views/articles/tag_index.html.erb index 774cf6ee7..e8179c7fe 100644 --- a/app/views/articles/tag_index.html.erb +++ b/app/views/articles/tag_index.html.erb @@ -43,7 +43,7 @@ data-requires-approval="<%= @tag_model.requires_approval %>" data-articles-since="<%= Timeframe.datetime_iso8601(params[:timeframe]) %>"> <%= render "articles/tags/sidebar" %> -
+
<%= render "articles/tags/sidebar_additional" %>
diff --git a/app/views/stories/_stories_list_script.html.erb b/app/views/stories/_stories_list_script.html.erb index c0f0576c1..c5c1e9883 100644 --- a/app/views/stories/_stories_list_script.html.erb +++ b/app/views/stories/_stories_list_script.html.erb @@ -10,7 +10,7 @@ el.classList.remove("active"); }); - document.getElementById('articles-list').addEventListener('click', function (event) { + document.getElementById('main-content').addEventListener('click', function (event) { var clickedEl = event.target; if (hasClass(clickedEl, "bm-initial") || hasClass(clickedEl, "bm-success")) { //do nothing diff --git a/spec/system/articles/user_visits_articles_by_tag_spec.rb b/spec/system/articles/user_visits_articles_by_tag_spec.rb index ab267506a..9ffd0d4ab 100644 --- a/spec/system/articles/user_visits_articles_by_tag_spec.rb +++ b/spec/system/articles/user_visits_articles_by_tag_spec.rb @@ -37,7 +37,7 @@ RSpec.describe "User visits articles by tag", type: :system do end it "shows the correct articles" do - within("#articles-list") do + within("#main-content") do expect(page).to have_text(article.title) expect(page).to have_text(article3.title) expect(page).not_to have_text(article2.title)