refactor -- reorganize file structure, small fixes to interaction / link data

Author: hmsklee

index.html

@@ -31,15 +31,15 @@
 
 <script src="js/panel.js"></script>
 <script src="js2/parser.js"></script>
-<script src="js2/tooltip.js"></script>
 <script src="js2/main.js"></script>
+<script src="js2/managers/tooltip.js"></script>
 <script src="js2/managers/labelmanager.js"></script>
 <script src="js2/managers/rowmanager.js"></script>
-<script src="js2/row.js"></script>
-<script src="js2/tag.js"></script>
-<script src="js2/word.js"></script>
-<script src="js2/wordcluster.js"></script>
-<script src="js2/link.js"></script>
+<script src="js2/components/row.js"></script>
+<script src="js2/components/tag.js"></script>
+<script src="js2/components/word.js"></script>
+<script src="js2/components/wordcluster.js"></script>
+<script src="js2/components/link.js"></script>
 
 <script type="text/javascript">
   Main.init();

js2/link.js js2/components/link.jsjs2/link.js renamed to js2/components/link.js

@@ -3,8 +3,7 @@ class Link {
       this.eventId = eventId;
       this.trigger = trigger;
       this.arguments = args;
-      // console.log('trigger\t\t',trigger);
-      // console.log.apply(null, args);
-
+      console.log('trigger\t\t',trigger);
+      console.log.apply(null, args);
     }
 }

js2/row.js js2/components/row.jsjs2/row.js renamed to js2/components/row.js

@@ -31,8 +31,7 @@ class WordTag {
   }
   updateWordWidth() {
     let ww = this.entity.ww;
-    let tw = this.ww;
-    if (tw > ww - 5) {
+    if (this.entity.val.length < 9) {
       this.line.plot('M0,25,l0,8');
     }
     else {
@@ -93,7 +92,6 @@ class WordTag {
       this.remove();
     }
     else {
-      this.updateWordWidth();
       this.entity.setBoxWidth();
     }
   }

js2/tag.js js2/components/tag.jsjs2/tag.js renamed to js2/components/tag.js

@@ -59,6 +59,7 @@ class WordCluster {
         let svg = this.svgs[i] = word.svg.group()
           .addClass('word-cluster');
 
+        // TODO: recalculate offset when tag is added/removed
         if (this.words.find(word => word.tag)) {
           svg.y(this.tagOffset * 1.9);
         }

js2/word.js js2/components/word.jsjs2/word.js renamed to js2/components/word.js

@@ -32,7 +32,7 @@ const Main = (function() {
     lm      = new LabelManager(svg);
 
     // load and render initial dataset by default
-    changeDataset(4);
+    changeDataset(2);
 
     // svg event listeners
     svg.on('row-resize', function(e) {
@@ -133,13 +133,12 @@ const Main = (function() {
           console.log('unhandled argument type', argument);
           break;
       }
-      return anchor;
+      return { anchor, type: argument.type };
     }
 
     // construct links from events and relations
     const links = [];
     parser.data.events.forEach(evt => {
-
       // create a link between the trigger and each of its arguments
       const trigger = entities.find(word => word.eventId === evt.trigger);
       const arguments = evt.arguments.map(searchForEntity);

js2/wordcluster.js js2/components/wordcluster.jsjs2/wordcluster.js renamed to js2/components/wordcluster.js

@@ -75,12 +75,12 @@ const LabelManager = (function() {
     }
   })
   document.addEventListener('keypress', function(e) {
-    // console.log(String.fromCharCode(e.which), e.which);
+    // console.log(String.fromCharCode(e.which), e.which, e.metaKey);
     if (activeObject && activeObject.isEditing) {
       if (e.which === 32) {
         e.preventDefault();
       }
-      if (!e.ctrlKey && !e.metaKey && !e.altKey) {
+      if (e.which > 31 && !e.ctrlKey && !e.metaKey && !e.altKey) {
         if (string === null) { string = ''; }
         updateString(string + String.fromCharCode(e.which));
       }