fix move down rowcode

hmsklee · hmsklee · commit 742df85c402b · 2017-06-12T16:37:38.000-05:00
diff --git a/index.html b/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
   <meta charset="utf-8">
diff --git a/js/interact.js b/js/interact.js
@@ -522,9 +522,9 @@ function setWordToXW(word, xval, wval) {
 
 }
 
-function dragWord(x, y, word) {
+function dragWord(x, y, word, direction) {
 
-  var dragDir = checkDragDirection(x);
+  var dragDir = direction || checkDragDirection(x);
 
   if (dragDir == directions.BACKWARD) {
     return checkIfCanMoveLeft(x + rowOffsetX, word.underneathRect.width(), y, word, false);
diff --git a/js/wordcollapser.js b/js/wordcollapser.js
@@ -36,6 +36,9 @@ const WordCollapser = (function() {
     if (c === 65) { // A
       listenForLeftWord();
     }
+    else if (c === 83) { // S
+      listenForUnjoin();
+    }
     else {
       cancel();
     }
@@ -54,7 +57,7 @@ const WordCollapser = (function() {
       text = text.slice(0, 12) + "…" + text.slice(-12);
     }
 
-    let phrase = new Word(text, leftWord.idx);
+    let phrase = new Word(text, leftWord.idx, ' ');
 
     let row = leftWord.row;
 
@@ -133,35 +136,46 @@ const WordCollapser = (function() {
   }
 
   function unjoinWord(word) {
+    let i = word.row.words.indexOf(word);
+    let row = word.row;
+
     [].splice.apply(wordObjs, [wordObjs.indexOf(word), 1].concat(word.removedWords));
-    [].splice.apply(word.row.words, [word.row.words.indexOf(word), 1].concat(word.removedWords));
+    [].splice.apply(row.words, [i, 1].concat(word.removedWords));
 
     // set position of uncollapsed words
     const rowWidth = Config.svgWidth - Config.edgePadding * 2;
     let x = word.leftX;
-    const y = word.underneathRect.y();
+    let y = word.underneathRect.y();
     word.removedWords.forEach(rw => {
-      rw.row = word.row;
-      moveWordToNewPosition(rw, x, y);
-      x += rw.underneathRect.width() + Config.wordPadding;
+      rw.row = row;
+      rw.leftX = -1;
       rw.svg.show();
     });
+
     // rearrange remaining words on row
-    let i = word.row.words.indexOf(word.removedWords[word.removedWords.length - 1]) + 1;
-    while (word.row.words[i]) {
-      if (x <= word.row.words[i].leftX) {
+    while (row.words[i]) {
+      if (x <= row.words[i].leftX) {
         break;
       }
-      moveWordToNewPosition(word.row.words[i], x, y);
-      x += word.row.words[i].underneathRect.width() + Config.wordPadding;
+      moveWordToNewPosition(row.words[i], x, y);
+      x += row.words[i].underneathRect.width() + Config.wordPadding;
       if (x > rowWidth) {
-        if (word.row.idx + 1 === rows.length) { appendRow(); }
-        moveWordDownARow(word.row.words[i]);        
+        // move down a row
+        if (row.idx + 1 === rows.length) { appendRow(); }
+        let w = row.words[i];
+        for (let j = row.words.length - 1; j >=i; --j) {
+          moveWordDownARow(row.words[j]);
+        }
+        row = w.row;
+        x = w.leftX + w.underneathRect.width() + Config.wordPadding;
+        y = w.underneathRect.y();
+        i = 1;
+      }
+      else {
+        ++i;
       }
-      ++i;
     }
 
-
     // revert assigned references to word in link
     function revertLinkWordObject(link) {
       ['leftWord', 'rightWord', 'nearestConnectedMaxWord', 'nearestConnectedMinWord', 'rootMaxWord', 'rootMinWord'].forEach(prop => {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+<!DOCTYPE html>`
`1`	`2`	`<html>`
`2`	`3`	`<head>`
`3`	`4`	`<meta charset="utf-8">`
Original file line number	Diff line number	Diff line change
`@@ -522,9 +522,9 @@ function setWordToXW(word, xval, wval) {`
`522`	`522`
`523`	`523`	`}`
`524`	`524`
`525`		`-function dragWord(x, y, word) {`
	`525`	`+function dragWord(x, y, word, direction) {`
`526`	`526`
`527`		`- var dragDir = checkDragDirection(x);`
	`527`	`+ var dragDir = direction \|\| checkDragDirection(x);`
`528`	`528`
`529`	`529`	`if (dragDir == directions.BACKWARD) {`
`530`	`530`	`return checkIfCanMoveLeft(x + rowOffsetX, word.underneathRect.width(), y, word, false);`