Oops, checked in a bug. Now properly checks if a tag exists or not (in

interact.js and annotate.js's Word class)

Author: angusforbes

index.html

@@ -135,10 +135,10 @@
 
 
 // 1. create Words and Links objects (in utils.js) */
-var wordObjs = createTestWords(3, 1, 15);
+var wordObjs = createTestWords(20, 1, 15);
 
 //var linkObjs = createTestLinks(1,1,0); 
-var linkObjs = createTestLinks(1,1,1); 
+var linkObjs = createTestLinks(4,4,4); 
 
 // 2. draw words and boxes around words
 drawWords(wordObjs);

js/annotate.js

@@ -180,8 +180,11 @@ class Word {
       this.rect = this.rectSVG.bbox();
 
       this.text.x(this.tempX + (this.tempW/2) - (this.text.bbox().w / 2) ); 
-      this.tagtext.x(this.tempX + (this.tempW/2) - (this.tagtext.bbox().w / 2) ); 
-    
+      
+      if (this.tag != null) {
+        this.tagtext.x(this.tempX + (this.tempW/2) - (this.tagtext.bbox().w / 2) ); 
+      }
+
       this.leftX = this.tempX; 
       this.rightX = this.tempX + this.tempW;
 

js/interact.js

@@ -770,8 +770,11 @@ function moveWordToNewPosition(w, nx, ny) {
 
   //TODO - make these match original position - the Y pos for text is off for tags and words - why isn't the text descent needed here?? ny and w.wy should be (and is!) the same - but the text y pos is a few pixels off! 
   //Looks like the entire row size jumps one pixel when adding a new row... think this may cause the 1 px differentce
-  w.tagtext.x(nx + (w.rect.w/2) - (w.tagtext.bbox().w/2)  ); 
-  w.tagtext.y(ny + textpaddingY/2);// - texts.tagText.descent);
+  
+  if (w.tag != null) {
+    w.tagtext.x(nx + (w.rect.w/2) - (w.tagtext.bbox().w/2)  ); 
+    w.tagtext.y(ny + textpaddingY/2);// - texts.tagText.descent);
+  }
 
   console.log("ny = " + ny);
   console.log("w.wy = " + w.wy);