From 8af649c249daea983a08d102284d571f0e88267b Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sun, 9 Nov 2014 15:01:03 +0200
Subject: scripts/model/graph.js merge resolution

---
 scripts/textanalysis.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'scripts/textanalysis.js')

diff --git a/scripts/textanalysis.js b/scripts/textanalysis.js
index dc9d1303..e911adf6 100644
--- a/scripts/textanalysis.js
+++ b/scripts/textanalysis.js
@@ -1,6 +1,6 @@
 "use strict";
 
-define('textanalysis', [], function() {
+define('textanalysis', ['model/util', 'model/diff'], function(model_util, model_diff) {
 var typeindex = 0;
 var nodetypes = ["person", "project", "skill", "deliverable", "objective"];
 var typeStack = [];
@@ -379,6 +379,7 @@ var textAnalyser = function (newtext, finalize) {
                 function (link) {
                     return [link.sourceName, link.targetName];
                 }));
+
         var k, n, l;
         if (comp.graph_same && !finalize) {
             if (comp.old_name && comp.new_name) {
@@ -389,7 +390,7 @@ var textAnalyser = function (newtext, finalize) {
                 graph.addLinkByName(l.sourceName, l.targetName, l.name, l.state, ret.drop_conjugator_links);
             }
         } else {
-            //REINITIALISE GRAPH (DUMB BUT IT WORKS)
+            // REINITIALISE GRAPH (DUMB BUT IT WORKS)
             graph.removeNodes("temp");
             graph.removeLinks("temp");
             for (k in ret.nodes) {
@@ -418,7 +419,7 @@ var textAnalyser = function (newtext, finalize) {
             graph.commit_diff_set(diff_set);
         }
 
-        //UPDATE GRAPH ONCE
+        // UPDATE GRAPH ONCE
         graph.update(!finalize && comp.graph_same);
     };
 
-- 
cgit v1.3.1