client/annotviz/app/js/annotsroll.js
changeset 109 8546e2181a73
parent 106 9b20ddf1fc70
child 112 3e075a48e19e
--- a/client/annotviz/app/js/annotsroll.js	Thu Jan 22 07:04:42 2015 +0100
+++ b/client/annotviz/app/js/annotsroll.js	Thu Jan 22 08:07:09 2015 +0100
@@ -47,15 +47,14 @@
     var annotStyles = _(opts.annotStyles).defaults(defaultAnnotStyles).value();
     for(var style in annotStyles) {
     	if (annotStyles[style].wordWrap === true){
-    		annotStyles[style].wordWrapWidth = this.widthRoll; 
+    		annotStyles[style].wordWrapWidth = this.widthRoll;
     	}
     }
-    console.log(annotStyles);
     var started = false;
     var ws = opts.ws;
     var externalRefresh = opts.externalRefresh;
     var stageView = opts.stageView;
-    
+
     stageView.registerComponent(this);
 
     var isHidden = function(child) {
@@ -74,7 +73,7 @@
             text     = data.content.text,
             user     = data.content.user,
             ts       = Date.parse(data.ts),
-            color    = this.getColor(ts, data.content.category.code);
+            color    = data.content.color || this.getColor(ts, data.content.category.code);
 
         this.addAnnot(category, text, user, color, ts);
     };