Annotation Tool: Removed conflict between tags-annotator and flagging-annotator

common/static/js/vendor/ova/tags-annotator.js

@@ -1032,7 +1032,7 @@ Annotator.Plugin.HighlightTags = (function(_super) {
             if (typeof anns.tags != "undefined" && this.colors !== {}) {
                 
                 for(var index = 0; index < anns.tags.length; ++index){
-                    
+                    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");
@@ -1040,6 +1040,7 @@ Annotator.Plugin.HighlightTags = (function(_super) {
                             $(annotations[annNum]).css("background","");
                         }
                     }
+                }
                 
             }else{
                 $(annotations[annNum]).css("background","");