Cleans up dragging code a bit, no longer need to rely on hack-y realign()

method anymore.

Author: angusforbes

index.html

@@ -136,7 +136,7 @@
 
 
 // 1. create Words and Links objects (in utils.js) */
-var wordObjs = createTestWords(20, 5, 11);
+var wordObjs = createTestWords(12, 5, 11);
 //var wordObjs = [];
 //wordObjs.push(new Word("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 0));
 //wordObjs.push(new Word("bbbbbbbbbbbbbbbbbbbbbbbbbb", 1));

js/annotate.js

@@ -130,27 +130,37 @@ class Word {
     //take temp values and update actual svg values
     update() {
 
-      //console.log("\n***\nin update : " + this.tempW);
+    //  console.log("\n***\nin update X = " + this.tempX + ", Y = " + this.tempY + ", W = " + this.tempW );
       this.rectSVG.x(this.tempX);
+      //this.rectSVG.y(this.tempY);
       this.rectSVG.width(this.tempW);
 
       this.underneathRect.x(this.tempX);
+      //this.underneathRect.y(this.tempY);
       this.underneathRect.width(this.tempW);
 
-
-       this.rect = this.rectSVG.bbox();
+      this.rect = this.rectSVG.bbox();
 
 
 
       this.text.x(this.tempX + (this.tempW/2) - (this.text.bbox().w / 2) ); 
+      //this.text.y(this.tempY + textpaddingY);
+
+    
       this.leftX = this.tempX; 
       this.rightX = this.tempX + this.tempW;
 
       this.percPos = (this.leftX-edgepadding) / (svgWidth-edgepadding*2);
 
+
+      //var handley = this.tempY + ( this.wh / 2 ) - ( handleH / 2 ); 
+
       this.leftHandle.x(this.tempX);
-      this.rightHandle.x(this.rightX - handleW);
+      //this.leftHandle.y(handley);
+      
 
+      this.rightHandle.x(this.rightX - handleW);
+      //this.rightHandle.y(handley);
 
     }