From 2249fc4893a2c5752b5476f5776d13dcd46be48b Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 2 Mar 2014 11:53:22 -0800 Subject: [PATCH] added pointer to node hover, fixed synapse permission edit bug --- app/assets/javascripts/Jit/graphsettings.js | 5 ++++- app/assets/javascripts/Jit/onCreateLabelHandler.js | 2 +- app/views/synapses/create.js.erb | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/Jit/graphsettings.js b/app/assets/javascripts/Jit/graphsettings.js index 316608b1..32dd938b 100644 --- a/app/assets/javascripts/Jit/graphsettings.js +++ b/app/assets/javascripts/Jit/graphsettings.js @@ -494,9 +494,12 @@ function onMouseMoveHandler(node, eventInfo, e) { if (MetamapsModel.edgeHoveringOver) { onMouseLeave(MetamapsModel.edgeHoveringOver); } + $('canvas').css('cursor', 'pointer'); return; + } else { + $('canvas').css('cursor', 'default'); } - + if (edge == false && MetamapsModel.edgeHoveringOver != false) { //mouse not on an edge, but we were on an edge previously onMouseLeave(MetamapsModel.edgeHoveringOver); diff --git a/app/assets/javascripts/Jit/onCreateLabelHandler.js b/app/assets/javascripts/Jit/onCreateLabelHandler.js index b6c9e9f4..25c5a2d6 100644 --- a/app/assets/javascripts/Jit/onCreateLabelHandler.js +++ b/app/assets/javascripts/Jit/onCreateLabelHandler.js @@ -279,7 +279,7 @@ function populateShowCard(node) { s.height( s.height() ).mCustomScrollbar('update'); var name = $(this).html(); - node.name = name; + node.name = decodeEntities(name); Mconsole.plot(); }); diff --git a/app/views/synapses/create.js.erb b/app/views/synapses/create.js.erb index b92a24e1..d2c8dcf8 100644 --- a/app/views/synapses/create.js.erb +++ b/app/views/synapses/create.js.erb @@ -33,7 +33,7 @@ if ( Mconsole != null) { showDesc: true, //will be changed by selectEdge category: '<%= @synapse.category %>', id: '<%= @synapse.id %>', - userid: '<%= @synapse.user.id %>', + userid: <%= @synapse.user.id %>, username: '<%= @synapse.user.name %>', permission: '<%= @synapse.permission %>' });