From d0d4ae6c44e1baca3d8549e570497483c7aa8391 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Fri, 12 Jun 2015 09:44:06 +0200 Subject: [PATCH] Improved check if highlighter is enabled. --- app/assets/javascripts/app/controllers/ticket_zoom.js.coffee | 3 ++- .../app/controllers/ticket_zoom/higlighter.js.coffee | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 02b78ed68..8a960be21 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -93,7 +93,8 @@ class App.TicketZoom extends App.Controller App.Event.trigger('ui::ticket::shown', { ticket_id: @ticket_id } ) - if !@highlighed + # inital load of highlights + if @highligher && !@highlighed @highlighed = true @highligher.loadHighlights() diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/higlighter.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/higlighter.js.coffee index 00b46843d..91ca915e3 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/higlighter.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/higlighter.js.coffee @@ -94,6 +94,7 @@ class App.TicketZoomHighlighter extends App.Controller # for testing purposes the highlights get stored in localStorage loadHighlights: -> + return if !@isRole('Agent') @el.closest('.content').find('.textBubble-content').each( (index, element) => article_id = $(element).data('id') article = App.TicketArticle.find(article_id)