From 1c3aa6c97310bbc4b9ad39a3331f9692967ae6f2 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Thu, 14 Mar 2013 21:01:09 -0400
Subject: [PATCH] more onCanvas/inCommons => whiteCircle/greenCircle changes in
 views. Also changed a thing in main/search.js.erb about the "temp" node being
 undefined instead of null that may fix an issue or not

---
 app/views/main/search.js.erb   | 15 +++++++--------
 app/views/topics/create.js.erb |  8 ++++----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/views/main/search.js.erb b/app/views/main/search.js.erb
index 9cc2e6dd..2be2dcc4 100644
--- a/app/views/main/search.js.erb
+++ b/app/views/main/search.js.erb
@@ -19,8 +19,8 @@ var even = true;
     var temp = Mconsole.graph.getNode('<%= topic.id %>');
     temp.setData('dim', 1, 'start');
     temp.setData('dim', 25, 'end');
-    temp.setData('inCommons',true);
-    temp.setData('onCanvas',false);
+    temp.setData('greenCircle',true);
+    temp.setData('whiteCircle',false);
     temp.setPos(new $jit.Complex(myX, myY), 'current');
     temp.setPos(new $jit.Complex(myX, myY), 'start');
     temp.setPos(new $jit.Complex(myX, myY), 'end');
@@ -28,17 +28,16 @@ var even = true;
     Mconsole.labels.plotLabel(Mconsole.canvas, temp, Mconsole.config);
     myX += 100;
     even = !even;
-  }
-  else {
+  } else {
     var temp = Mconsole.graph.getNode('<%= topic.id %>');
-    if (temp == null || temp.getData('inCommons')) {
+    if (temp == undefined) {
       var newnode = <%= topic.self_as_json.html_safe %>;
       Mconsole.graph.addNode(newnode);
       var temp = Mconsole.graph.getNode('<%= topic.id %>');
       temp.setData('dim', 1, 'start');
       temp.setData('dim', 25, 'end');
-      temp.setData('inCommons',true);
-      temp.setData('onCanvas',false);
+      temp.setData('greenCircle',true);
+      temp.setData('whiteCircle',false);
       if (myX > (w-100)) {
         myX = -w + 400;
         myY += 200;
@@ -85,7 +84,7 @@ var even = true;
         username: '<%= synapse.user.name %>',					
         permission: '<%= synapse.permission %>'
       });
-      temp.data.$direction = d;
+      temp.setData('direction', d);
       Mconsole.fx.plotLine(temp, Mconsole.canvas);
     }
 <% end %>
diff --git a/app/views/topics/create.js.erb b/app/views/topics/create.js.erb
index a69c0a3c..19a1cee2 100644
--- a/app/views/topics/create.js.erb
+++ b/app/views/topics/create.js.erb
@@ -25,8 +25,8 @@ if (!$.isEmptyObject(Mconsole.graph.nodes)) {
   var temp = Mconsole.graph.getNode('<%= @topic.id %>');
   temp.setData('dim', 1, 'start');
   temp.setData('dim', 40, 'end');
-  temp.setData('onCanvas', false);
-  temp.setData('inCommons', false);
+  temp.setData('whiteCircle', false);
+  temp.setData('greenCircle', false);
   
   if (gType == "centered") {
     var tempPos = new $jit.Complex(x, y);
@@ -84,8 +84,8 @@ if (!$.isEmptyObject(Mconsole.graph.nodes)) {
   var temp = Mconsole.graph.getNode('<%= @topic.id %>');
   temp.setData('dim', 1, 'start');
   temp.setData('dim', 25, 'end');
-  temp.setData('onCanvas', false);
-  temp.setData('inCommons', false);
+  temp.setData('whiteCircle', false);
+  temp.setData('greenCircle', false);
   if (gType == "arranged" || gType == "chaotic") {
     <% if not @mapping.nil? %>
       temp.setData('mappingid', <%= @mapping.id %>);