Skip to content

E
edx-platform
Commit a5d8669f by lduarte1991
Options

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

parent 19a3410b
Showing with 7 additions and 6 deletions
common/static/js/vendor/ova/tags-annotator.js
...@@ -1032,12 +1032,13 @@ Annotator.Plugin.HighlightTags = (function(_super) { ...@@ -1032,12 +1032,13 @@ Annotator.Plugin.HighlightTags = (function(_super) {
if (typeof anns.tags != "undefined" && this.colors !== {}) { if (typeof anns.tags != "undefined" && this.colors !== {}) {
for(var index = 0; index < anns.tags.length; ++index){ for(var index = 0; index < anns.tags.length; ++index){
if(anns.tags[index].indexOf("flagged-") == -1){
if (typeof this.colors[anns.tags[index]] != "undefined") { if (typeof this.colors[anns.tags[index]] != "undefined") {
var finalcolor = this.colors[anns.tags[index]]; var finalcolor = this.colors[anns.tags[index]];
$(annotations[annNum]).css("background","rgba("+finalcolor.red+","+finalcolor.green+","+finalcolor.blue+",0.3"); $(annotations[annNum]).css("background","rgba("+finalcolor.red+","+finalcolor.green+","+finalcolor.blue+",0.3");
}else{ }else{
$(annotations[annNum]).css("background",""); $(annotations[annNum]).css("background","");
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment