diff -r 12f782a13fa2 -r 119b6193c493 client/annotviz/app/js/annotsroll.js --- a/client/annotviz/app/js/annotsroll.js Fri Jan 23 09:57:03 2015 +0100 +++ b/client/annotviz/app/js/annotsroll.js Fri Jan 23 09:58:21 2015 +0100 @@ -50,7 +50,7 @@ var marginX = 15; for(var style in annotStyles) { if (annotStyles[style].wordWrap === true){ - annotStyles[style].wordWrapWidth = this.widthRoll - marginX; + annotStyles[style].wordWrapWidth = this.widthRoll - marginX; } } var started = false; @@ -59,7 +59,7 @@ var stageView = opts.stageView; var waitInterval; var wait = 0; - + stageView.registerComponent(this); var isHidden = function(child) { @@ -99,7 +99,7 @@ resColor = colorsDef.defaultColor || DEFAULT_ANNOT_COLOR; } return resColor; - } + }; this.addAnnot = function(category, text, user, color, ts){ @@ -113,9 +113,9 @@ .beginFill(colorHex) .drawRect(x, y, 10, 3) .endFill(); - + this.container.addChild(graphics); - + var textHeight = 0; var catLabel = new PIXI.Text( category, @@ -125,7 +125,7 @@ catLabel.y = y - 23; this.container.addChild(catLabel); textHeight += (catLabel.height - 23 + 2); - + if(text) { var catText = new PIXI.Text(text, annotStyles.text); catText.x = x + marginX; @@ -133,13 +133,13 @@ this.container.addChild(catText); textHeight += (catText.height + 2); } - + var catUser = new PIXI.Text(user, annotStyles.user); catUser.x = x + marginX; catUser.y = y + textHeight; this.container.addChild(catUser); textHeight += (catUser.height + 8); - + if (this.ignoreAnnots === true){ wait = textHeight / this.pixelsPerSecond; waitInterval = setInterval(function() {_this.refreshWait();}, 1000); @@ -169,7 +169,7 @@ var diff = (this.startTs - Date.now())/1000; this.moveTo(diff); }; - + this.refreshWait = function(){ wait -= 1; if (wait < 0){ @@ -196,7 +196,7 @@ }); }; - + this.start = function() { if(!started) {