From 647573dcadd6a23a75e2208673caed42a2dcc705 Mon Sep 17 00:00:00 2001
From: Ben Halpern <bendhalpern@gmail.com>
Date: Tue, 28 Sep 2021 15:51:30 -0400
Subject: [PATCH] [Tiny fix] Fix a couple small bugs from DisplayAd clean up
 (#14846)

* Clean up and fix DisplayAd click JS

* Fix double use of variable
---
 .../javascripts/initializers/initializeBaseTracking.js.erb | 7 ++++---
 app/services/html/parser.rb                                | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/initializers/initializeBaseTracking.js.erb b/app/assets/javascripts/initializers/initializeBaseTracking.js.erb
index b0a37180a..8bcfd96d0 100644
--- a/app/assets/javascripts/initializers/initializeBaseTracking.js.erb
+++ b/app/assets/javascripts/initializers/initializeBaseTracking.js.erb
@@ -143,10 +143,10 @@ function trackCustomImpressions() {
       && windowBigEnough
       && checkUserLoggedIn()) {
         var csrfToken = tokenMeta.getAttribute('content');
-        [].forEach.call(displayAds, function(unit) {
+        displayAds.forEach(unit => {
           trackAdImpression(csrfToken, unit);
           unit.removeEventListener('click', trackAdClick, false );
-          unit.addEventListener('click', function(e) { trackAdClick(csrfToken, e) });
+          unit.addEventListener('click', function(e) { trackAdClick(csrfToken, e.target) });
         });
       }
   }, 1800)
@@ -221,7 +221,8 @@ function trackAdImpression(token, adBox) {
   })
 }
 
-function trackAdClick(token, adBox) {
+function trackAdClick(token, clickedElement) {
+  var adBox = clickedElement.closest('[data-display-unit]');
   if (!adClicked) {
     var dataBody = {
       display_ad_event: {
diff --git a/app/services/html/parser.rb b/app/services/html/parser.rb
index 42ddfe292..030e36389 100644
--- a/app/services/html/parser.rb
+++ b/app/services/html/parser.rb
@@ -44,9 +44,9 @@ module Html
         next if allowed_image_host?(src)
 
         if synchronous_detail_detection && img
-          width, height = image_width_height(img)
-          img["width"] = width
-          img["height"] = height
+          attribute_width, attribute_height = image_width_height(img)
+          img["width"] = attribute_width
+          img["height"] = attribute_height
         end
 
         img["loading"] = "lazy"