From 662a99ade34fa4c58bb850ba0c6b10d9cb651231 Mon Sep 17 00:00:00 2001 From: Matheus Azzi Date: Thu, 19 Dec 2019 13:03:34 -0300 Subject: [PATCH] Remove unnecessary reaction call (#5122) [deploy] Clicking the button to follow people on search page was erroneously triggering a reaction request, thus not having the reactable_id. We've updated the handlers not to trigger it. --- .../javascripts/initializers/initializeAllFollowButts.js | 1 - .../javascripts/initializers/initializeReadingListIcons.js | 4 ++-- app/assets/javascripts/utilities/buildArticleHTML.js.erb | 4 ++-- app/assets/stylesheets/articles.scss | 4 ++-- app/assets/stylesheets/more-articles.scss | 2 +- app/views/articles/_single_story.html.erb | 2 +- app/views/articles/index.html.erb | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/initializers/initializeAllFollowButts.js b/app/assets/javascripts/initializers/initializeAllFollowButts.js index 0d150cdf9..ee1defafd 100644 --- a/app/assets/javascripts/initializers/initializeAllFollowButts.js +++ b/app/assets/javascripts/initializers/initializeAllFollowButts.js @@ -9,7 +9,6 @@ function initializeAllFollowButts() { function initializeFollowButt(butt) { var user = userData(); - var deviceWidth = window.innerWidth > 0 ? window.innerWidth : screen.width; var buttInfo = JSON.parse(butt.dataset.info); var userStatus = document .getElementsByTagName('body')[0] diff --git a/app/assets/javascripts/initializers/initializeReadingListIcons.js b/app/assets/javascripts/initializers/initializeReadingListIcons.js index b7980e4d7..bb58a8317 100644 --- a/app/assets/javascripts/initializers/initializeReadingListIcons.js +++ b/app/assets/javascripts/initializers/initializeReadingListIcons.js @@ -14,7 +14,7 @@ function initializeReadingListIcons() { // set SAVE or SAVED articles buttons function setReadingListButtonsState() { - var readingListButtons = document.getElementsByClassName('bookmark-engage'); + var readingListButtons = document.getElementsByClassName('bookmark-button'); Array.from(readingListButtons).forEach(highlightButton); } @@ -150,7 +150,7 @@ function isReadingListButtonHoverTarget(element) { return ( (element.tagName === 'BUTTON' && - classList.contains('bookmark-engage') && + classList.contains('bookmark-button') && classList.contains('selected')) || (element.tagName === 'SPAN' && classList.contains('bm-success')) ); diff --git a/app/assets/javascripts/utilities/buildArticleHTML.js.erb b/app/assets/javascripts/utilities/buildArticleHTML.js.erb index 8a21ebd51..058f62ffb 100644 --- a/app/assets/javascripts/utilities/buildArticleHTML.js.erb +++ b/app/assets/javascripts/utilities/buildArticleHTML.js.erb @@ -77,12 +77,12 @@ function buildArticleHTML(article) { } var saveButton = ''; if (article.class_name === "Article") { - saveButton = '' } else if (article.class_name === "User") { - saveButton = '' diff --git a/app/assets/stylesheets/articles.scss b/app/assets/stylesheets/articles.scss index ca95f311b..8186126be 100644 --- a/app/assets/stylesheets/articles.scss +++ b/app/assets/stylesheets/articles.scss @@ -772,7 +772,7 @@ &.reactions-count { left: 20px; } - &.bookmark-engage { + &.engage-button { right: 12px; border: 2px solid transparent; border-radius: 3px; @@ -809,7 +809,7 @@ margin-top: -38px; bottom: auto; z-index: 10; - &.bookmark-engage { + &.engage-button { margin-top: -39px; } } diff --git a/app/assets/stylesheets/more-articles.scss b/app/assets/stylesheets/more-articles.scss index 044c5f85b..8a0a7f4f7 100644 --- a/app/assets/stylesheets/more-articles.scss +++ b/app/assets/stylesheets/more-articles.scss @@ -184,7 +184,7 @@ } } } - .bookmark-engage { + .engage-button { font-family: $helvetica-condensed; background: darken($purple, 26%); color: white; diff --git a/app/views/articles/_single_story.html.erb b/app/views/articles/_single_story.html.erb index c4c83c8ae..e38c7b281 100644 --- a/app/views/articles/_single_story.html.erb +++ b/app/views/articles/_single_story.html.erb @@ -57,7 +57,7 @@