lowered synapse alpha

app/assets/javascripts/Jit/graphsettings-event-handlers.js

@@ -60,7 +60,7 @@ function selectNodeOnClickHandler(node, e) {
   }
   //trigger animation to final styles
   Mconsole.fx.animate({
-    modes: ['edge-property:lineWidth:color'],
+    modes: ['edge-property:lineWidth:color:alpha'],
     duration: 500
   });
   Mconsole.plot();

app/assets/javascripts/Jit/graphsettings.js

@@ -34,7 +34,8 @@ function graphSettings(type) {
        overridable: true,
        color: '#222222',
        type: 'customEdge',
-       lineWidth: 2
+       lineWidth: 2,
+       alpha: 0.4
     },
     //Native canvas text styling
     Label: {
@@ -331,10 +332,11 @@ function onMouseEnter(edge) {
   if (!showDesc) {
     edge.setDataset('end', {
       lineWidth: 4,
-      color: '#222222'
+      color: '#222222',
+      alpha: 1
     });
     Mconsole.fx.animate({
-      modes: ['edge-property:lineWidth:color'],
+      modes: ['edge-property:lineWidth:color:alpha'],
       duration: 100
     });
     Mconsole.plot();
@@ -347,10 +349,11 @@ function onMouseLeave(edge) {
   if (!showDesc) {
     edge.setDataset('end', {
       lineWidth: 2,
-      color: '#222222'
+      color: '#222222',
+      alpha: 0.4
     });
     Mconsole.fx.animate({
-      modes: ['edge-property:lineWidth:color'],
+      modes: ['edge-property:lineWidth:color:alpha'],
       duration: 100
     });
   }

app/assets/javascripts/Jit/select-edit-delete-nodes-and-edges.js

@@ -125,10 +125,11 @@ function selectEdge(edge) {
     edge.setData('showDesc', true, 'current');
     edge.setDataset('end', {
       lineWidth: 4,
-      color: '#FFFFFF'
+      color: '#FFFFFF',
+      alpha: 1
     });
     Mconsole.fx.animate({
-      modes: ['edge-property:lineWidth:color'],
+      modes: ['edge-property:lineWidth:color:alpha'],
       duration: 100
     });
   }
@@ -141,18 +142,20 @@ function deselectEdge(edge) {
     edge.setData('showDesc', false, 'current');
     edge.setDataset('end', {
       lineWidth: 2,
-      color: '#222222'
+      color: '#222222',
+      alpha: 0.4
     });
 
     if (MetamapsModel.edgeHoveringOver == edge) {
       edge.setDataset('end', {
         lineWidth: 4,
-        color: '#222222'
+        color: '#222222',
+        alpha: 1
       });
     }
 
     Mconsole.fx.animate({
-      modes: ['edge-property:lineWidth:color'],
+      modes: ['edge-property:lineWidth:color:alpha'],
       duration: 100
     });
   }

app/helpers/topics_helper.rb

@@ -57,6 +57,7 @@ module TopicsHelper
         @synapsedata['$userid'] = synapse.user.id
         @synapsedata['$username'] = synapse.user.name
         @synapsedata['$direction'] = [synapse.node1_id.to_s(), synapse.node2_id.to_s()]
+        @synapsedata['$permission'] = synapse.permission
 				json.data @synapsedata
 		  end
 
@@ -72,6 +73,7 @@ module TopicsHelper
       @topicdata['$inmaps'] = @inmaps
 		  @topicdata['$userid'] = topic.user.id
 		  @topicdata['$username'] = topic.user.name
+      @topicdata['$permission'] = topic.permission
 		  json.data @topicdata
 		  json.id topic.id
 		  json.name topic.name
@@ -99,9 +101,13 @@ module TopicsHelper
 
 				@synapsedata = Hash.new
 				@synapsedata['$desc'] = synapse.desc
-				@synapsedata['$category'] = synapse.category
-				@synapsedata['$userid'] = synapse.user.id
-				@synapsedata['$username'] = synapse.user.name
+        @synapsedata['$showDesc'] = false
+        @synapsedata['$category'] = synapse.category
+        @synapsedata['$id'] = synapse.id
+        @synapsedata['$userid'] = synapse.user.id
+        @synapsedata['$username'] = synapse.user.name
+        @synapsedata['$direction'] = [synapse.node1_id.to_s(), synapse.node2_id.to_s()]
+        @synapsedata['$permission'] = synapse.permission
 				json.data @synapsedata
 		  end
 
@@ -117,7 +123,7 @@ module TopicsHelper
       @topicdata['$inmaps'] = @inmaps
 		  @topicdata['$userid'] = topic.user.id
 		  @topicdata['$username'] = topic.user.name
-
+      @topicdata['$permission'] = topic.permission
 		  json.data @topicdata
 		  json.id topic.id
 		  json.name topic.name

public/assets/manifest.yml

@@ -143,8 +143,8 @@ ui-icons_cd0a0a_256x240.png: ui-icons_cd0a0a_256x240-c0c1ec6a8bcf48fec40303e975a
 ui-icons_cd0a0a_256x240/index.png: ui-icons_cd0a0a_256x240-c0c1ec6a8bcf48fec40303e975a4dfa6.png
 wildcard.png: wildcard-0987c616d3d98b5e5a4cc29e1c5f3123.png
 wildcard/index.png: wildcard-0987c616d3d98b5e5a4cc29e1c5f3123.png
-application.js: application-e381eaa7bb497b297b36147cfd629abb.js
-application/index.js: application-e381eaa7bb497b297b36147cfd629abb.js
+application.js: application-ea5e981446f3d58ff2d6d034b0632809.js
+application/index.js: application-ea5e981446f3d58ff2d6d034b0632809.js
 scroll/mCSB_buttons.png: scroll/mCSB_buttons-81b42ba0c7dc3ded1f392318bb8efd8a.png
 scroll/mCSB_buttons/index.png: scroll/mCSB_buttons-81b42ba0c7dc3ded1f392318bb8efd8a.png
 application.css: application-53e9765262d6851fbadb15b48dbcebf4.css