Cleans up code in interact.js, simplifies the drag handle and drag word

code.

Author: angusforbes

index.html

@@ -134,14 +134,14 @@
 
 
 // 1. create Words and Links objects (in utils.js) */
-var wordObjs = createTestWords(12, 1, 15);
+var wordObjs = createTestWords(10, 1, 11);
 //var wordObjs = [];
 //wordObjs.push(new Word("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 0));
 //wordObjs.push(new Word("bbbbbbbbbbbbbbbbbbbbbbbbbb", 1));
 
 
-//var linkObjs = createTestLinks(0, 0, 0); 
 var linkObjs = createTestLinks(3, 3, 3); 
+//var linkObjs = createTestLinks(3, 3, 3); 
 
 // 2. draw words and boxes around words
 drawWords(wordObjs);

js/annotate.js

@@ -124,6 +124,7 @@ class Word {
       return Math.max(minWordWidth, this.tw);
     }
 
+    /* must return a value less than row width - edgepaddings, else will try to reposition long words forever! */
     getMaxWidth() {
       return (this.row.rect.width() - (edgepadding*2)) / 3.1; 
     }
@@ -177,7 +178,8 @@ function checkAndUpdateWordToWordSlots(link, startSlot) { //, minWord, minSide,
 
       if (i == wo1.idx) { //check right side...
 
-        if (side1 == 0) { //then have to check left side too...
+        //side1 == 0
+        if (side1 == sides.LEFT) { //then have to check left side too...
 
           if (checkSlotAvailabity(x, wordObjs[i].slotsL)) {
 
@@ -210,7 +212,8 @@ function checkAndUpdateWordToWordSlots(link, startSlot) { //, minWord, minSide,
           break;
         }
 
-        if (side2 == 1) { //then have to check right side too...
+        //side2 == 1
+        if (side2 == sides.RIGHT) { //then have to check right side too...
 
           if (checkSlotAvailabity(x, wordObjs[i].slotsR)) {
             slotIsAvailable = false;
@@ -233,7 +236,8 @@ function checkAndUpdateWordToWordSlots(link, startSlot) { //, minWord, minSide,
 
       if (i == wo1.idx) { //update right side...
 
-        if (side1 == 0) {
+        //side1 == 0 
+        if (side1 == sides.LEFT) {
           wordObjs[i].slotsL.push(useSlot);
         }
 
@@ -248,7 +252,8 @@ function checkAndUpdateWordToWordSlots(link, startSlot) { //, minWord, minSide,
 
         wordObjs[i].slotsL.push(useSlot);
 
-        if (side2 == 1) {
+        //side2 == 1
+        if (side2 == sides.RIGHT) {
           wordObjs[i].slotsR.push(useSlot);
         }
       } 
@@ -475,21 +480,23 @@ function createLink(link) {
   //console.log("rightWord = " + link.rightWord.id);
 
   //explicitly link parents of link (i.e., links that attach to this link)
-  if (link.leftAttach == 0) {
+  //if (link.leftAttach == 0) {
+  if (link.leftAttach == sides.LEFT) {
     //console.log(link.leftWord);
     //console.log(link.leftWord.parentsL);
     link.leftWord.parentsL.push(link);
-  } else {
+  } else if (link.leftAttach == sides.RIGHT) {
     //console.log(link.leftWord);
     //console.log(link.leftWord.parentsR);
     link.leftWord.parentsR.push(link);
   }
 
-  if (link.rightAttach == 0) {
+  //if (link.rightAttach == 0) {
+  if (link.rightAttach == sides.LEFT) {
     //console.log(link.rightWord);
     //console.log(link.rightWord.parentsL);
     link.rightWord.parentsL.push(link);
-  } else {
+  } else if (link.rightAttach == sides.RIGHT) {
     //console.log(link.rightWord);
     //console.log(link.rightWord.parentsR);
     link.rightWord.parentsR.push(link);

js/enums.js

@@ -5,7 +5,8 @@ var types = {
 };
 
 var sides = {
-  LEFT: 0,
+  LEFT: -1,
+  CENTER: 0,
   RIGHT: 1,
 };