Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
lduarte1991
2014-07-10 11:18:11 -04:00
parent 19a3410b4b
commit a5d8669f68
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/static/js/vendor/ova/tags-annotator.js vendored
View File

@@ -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","");
}
}
}