Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #3950 - Uncaught TypeError in ticket zoom highlighter

Browse source
This commit is contained in:
Bola Ahmed Buari 2022-02-04 18:14:17 +01:00 committed by Dominik Klein
parent 7e9ec397be
commit b858b97742
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/ticket_zoom/highlighter.coffee
View file

@ -212,6 +212,8 @@ class App.TicketZoomHighlighter extends App.Controller
# - clears the selection # - clears the selection
toggleHighlightAtSelection: (article, article_id) => toggleHighlightAtSelection: (article, article_id) =>
return if !article
selection = rangy.getSelection() selection = rangy.getSelection()
# activate selection background # activate selection background

2
app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco
View file

@ -12,7 +12,7 @@
</div> </div>
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" role="menu">
<% for entry, i in @colors: %> <% 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 %>"> <a role="menuitem" tabindex="-1" class="js-highlightColor" data-key="<%= i %>">
<span class="dropdown-iconSpacer"> <span class="dropdown-iconSpacer">
<span class="color-swatch icon" style="color: <%= entry.color %>"></span> <span class="color-swatch icon" style="color: <%= entry.color %>"></span>

4
app/assets/javascripts/app/views/ticket_zoom/highlighter.jst.eco
View file

@ -7,7 +7,7 @@
</div> </div>
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" role="menu">
<% for entry, i in @colors: %> <% 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 %>"> <a role="menuitem" tabindex="-1" class="js-highlightColor" data-key="<%= i %>">
<span class="dropdown-iconSpacer"> <span class="dropdown-iconSpacer">
<span class="color-swatch icon" style="color: <%= entry.color %>"></span> <span class="color-swatch icon" style="color: <%= entry.color %>"></span>
@ -19,4 +19,4 @@
</a> </a>
<% end %> <% end %>
</ul> </ul>
</div> </div>

9
app/assets/stylesheets/zammad.scss
View file

@ -9025,6 +9025,15 @@ a.list-group-item.active > .badge,
padding: 0 18px; padding: 0 18px;
} }
li.dropdown-highlight-list {
// remove padding to add more click area for anchor tag
padding: 0;
a {
padding: 11px 18px;
}
}
.icon { .icon {
fill: currentColor; fill: currentColor;
} }