diff --git a/app/assets/javascripts/Jit/graphsettings-event-handlers.js b/app/assets/javascripts/Jit/graphsettings-event-handlers.js index 2e40b82c..f18d6085 100644 --- a/app/assets/javascripts/Jit/graphsettings-event-handlers.js +++ b/app/assets/javascripts/Jit/graphsettings-event-handlers.js @@ -61,6 +61,9 @@ function nodeDoubleClickHandler(node, e) { }//doubleClickNodeHandler +/* + * Returns a boolean saying if the node was double clicked in our understanding of the word + */ function nodeWasDoubleClicked() { //grab the timestamp of the click var storedTime = MetamapsModel.lastNodeClick; @@ -294,4 +297,4 @@ function touchPanZoomHandler(eventInfo, e) { lastDist = dist; } -} \ No newline at end of file +} diff --git a/app/controllers/synapses_controller.rb b/app/controllers/synapses_controller.rb index 4a4910ab..e1fe3f90 100644 --- a/app/controllers/synapses_controller.rb +++ b/app/controllers/synapses_controller.rb @@ -5,7 +5,17 @@ class SynapsesController < ApplicationController respond_to :html, :js, :json - autocomplete :synapse, :desc, :full => true + def autocomplete_synapse_desc + term = params[:term] + if term && !term.empty? + items = Synapse.select('DISTINCT "desc"'). + where('LOWER("desc") like ?', term.downcase + '%'). + limit(10).order('"desc"') + else + items = {} + end + render :json => json_for_autocomplete(items, :desc) + end # GET synapses # or GET users/:user_id/synapses diff --git a/app/views/topics/create.js.erb b/app/views/topics/create.js.erb index 19a1cee2..18cb397d 100644 --- a/app/views/topics/create.js.erb +++ b/app/views/topics/create.js.erb @@ -72,7 +72,7 @@ if (!$.isEmptyObject(Mconsole.graph.nodes)) { modes: ['node-property:dim'], duration: 500, onComplete: function() { - selectNodeOnClickHandler(temp); + selectNode(temp); } }); @@ -101,7 +101,7 @@ if (!$.isEmptyObject(Mconsole.graph.nodes)) { modes: ['node-property:dim'], duration: 500, onComplete: function() { - selectNodeOnClickHandler(temp); + selectNode(temp); } }); }