From b858b97742baf80ee543bd6d9c4c79c2d4d79537 Mon Sep 17 00:00:00 2001
From: Bola Ahmed Buari <bb@zammad.com>
Date: Fri, 4 Feb 2022 18:14:17 +0100
Subject: [PATCH] Fixes #3950 - Uncaught TypeError in ticket zoom highlighter

---
 .../app/controllers/ticket_zoom/highlighter.coffee       | 2 ++
 .../javascripts/app/views/layout_ref/ticket_zoom.jst.eco | 2 +-
 .../app/views/ticket_zoom/highlighter.jst.eco            | 4 ++--
 app/assets/stylesheets/zammad.scss                       | 9 +++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/highlighter.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/highlighter.coffee
index a9906f67d..e693777fd 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom/highlighter.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/highlighter.coffee
@@ -212,6 +212,8 @@ class App.TicketZoomHighlighter extends App.Controller
   # - clears the selection
 
   toggleHighlightAtSelection: (article, article_id) =>
+    return if !article
+
     selection = rangy.getSelection()
 
     # activate selection background
diff --git a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco
index fc260ebf1..ef343cb0c 100644
--- a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco
@@ -12,7 +12,7 @@
           </div>
           <ul class="dropdown-menu dropdown-menu-right" role="menu">
             <% for entry, i in @colors: %>
-            <li role="presentation">
+            <li role="presentation" class="dropdown-highlight-list">
               <a role="menuitem" tabindex="-1" class="js-highlightColor" data-key="<%= i %>">
                 <span class="dropdown-iconSpacer">
                   <span class="color-swatch icon" style="color: <%= entry.color %>"></span>
diff --git a/app/assets/javascripts/app/views/ticket_zoom/highlighter.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/highlighter.jst.eco
index 454ea6f73..6a4d9b46b 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/highlighter.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/highlighter.jst.eco
@@ -7,7 +7,7 @@
   </div>
   <ul class="dropdown-menu dropdown-menu-right" role="menu">
     <% for entry, i in @colors: %>
-    <li role="presentation">
+    <li role="presentation" class="dropdown-highlight-list">
       <a role="menuitem" tabindex="-1" class="js-highlightColor" data-key="<%= i %>">
         <span class="dropdown-iconSpacer">
           <span class="color-swatch icon" style="color: <%= entry.color %>"></span>
@@ -19,4 +19,4 @@
       </a>
     <% end %>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index e47ccaa2c..7e33f4eb3 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -9025,6 +9025,15 @@ a.list-group-item.active > .badge,
     padding: 0 18px;
   }
 
+  li.dropdown-highlight-list {
+    // remove padding to add more click area for anchor tag
+    padding: 0;
+
+    a {
+      padding: 11px 18px;
+    }
+  }
+
   .icon {
     fill: currentColor;
   }