From a5d8669f68f6d1a14a79b8a42dd3b7552b7c428f Mon Sep 17 00:00:00 2001 From: lduarte1991 Date: Thu, 10 Jul 2014 11:18:11 -0400 Subject: [PATCH] Annotation Tool: Removed conflict between tags-annotator and flagging-annotator --- common/static/js/vendor/ova/tags-annotator.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/common/static/js/vendor/ova/tags-annotator.js b/common/static/js/vendor/ova/tags-annotator.js index 8ff387f9e3..2de497b121 100644 --- a/common/static/js/vendor/ova/tags-annotator.js +++ b/common/static/js/vendor/ova/tags-annotator.js @@ -1032,12 +1032,13 @@ Annotator.Plugin.HighlightTags = (function(_super) { if (typeof anns.tags != "undefined" && this.colors !== {}) { for(var index = 0; index < anns.tags.length; ++index){ - - if (typeof this.colors[anns.tags[index]] != "undefined") { - var finalcolor = this.colors[anns.tags[index]]; - $(annotations[annNum]).css("background","rgba("+finalcolor.red+","+finalcolor.green+","+finalcolor.blue+",0.3"); - }else{ - $(annotations[annNum]).css("background",""); + if(anns.tags[index].indexOf("flagged-") == -1){ + if (typeof this.colors[anns.tags[index]] != "undefined") { + var finalcolor = this.colors[anns.tags[index]]; + $(annotations[annNum]).css("background","rgba("+finalcolor.red+","+finalcolor.green+","+finalcolor.blue+",0.3"); + }else{ + $(annotations[annNum]).css("background",""); + } } }