glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

smoother synapse creation with clicks/tabs

Browse source
This commit is contained in:
Devin Howard 2016-02-11 14:54:00 +08:00
parent 48863ce246
commit 056ef2b5b6
2 changed files with 13 additions and 7 deletions
app
assets/javascripts/src
Metamaps.js.erb
controllers
synapses_controller.rb

16
app/assets/javascripts/src/Metamaps.js.erb
View file

@ -736,10 +736,6 @@ Metamaps.Create = {
init: function () { init: function () {
var self = Metamaps.Create.newSynapse; var self = Metamaps.Create.newSynapse;
$('#synapse_desc').keyup(function () {
Metamaps.Create.newSynapse.description = $(this).val();
});
var synapseBloodhound = new Bloodhound({ var synapseBloodhound = new Bloodhound({
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'), datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
@ -795,6 +791,16 @@ Metamaps.Create = {
}] }]
); );
$('#synapse_desc').keyup(function () {
Metamaps.Create.newSynapse.description = $(this).val();
});
$('#synapse_desc').focusout(function() {
// Metamaps.Create.newSynapse.description = $(this).val();
Metamaps.Synapse.createSynapseLocally();
});
$('#synapse_desc').bind('typeahead:select', function (event, datum, dataset) { $('#synapse_desc').bind('typeahead:select', function (event, datum, dataset) {
if (datum.id) { // if they clicked on an existing synapse get it if (datum.id) { // if they clicked on an existing synapse get it
Metamaps.Synapse.getSynapseFromAutocomplete(datum.id); Metamaps.Synapse.getSynapseFromAutocomplete(datum.id);
@ -811,7 +817,7 @@ Metamaps.Create = {
topic2id: null, topic2id: null,
newSynapseId: null, newSynapseId: null,
open: function () { open: function () {
$('#new_synapse').fadeIn('fast', function () { $('#new_synapse').fadeIn(100, function () {
$('#synapse_desc').focus(); $('#synapse_desc').focus();
}); });
Metamaps.Create.newSynapse.beingCreated = true; Metamaps.Create.newSynapse.beingCreated = true;

4
app/controllers/synapses_controller.rb
View file

@ -22,7 +22,7 @@ class SynapsesController < ApplicationController
# POST /synapses.json # POST /synapses.json
def create def create
@synapse = Synapse.new(synapse_params) @synapse = Synapse.new(synapse_params)
@synapse.update_attribute :desc, "" if @synapse.desc.nil? @synapse.desc = "" if @synapse.desc.nil?
respond_to do |format| respond_to do |format|
if @synapse.save if @synapse.save
@ -37,7 +37,7 @@ class SynapsesController < ApplicationController
# PUT /synapses/1.json # PUT /synapses/1.json
def update def update
@synapse = Synapse.find(params[:id]) @synapse = Synapse.find(params[:id])
@synapse.update_attribute :desc, "" if @synapse.desc.nil? @synapse.desc = "" if @synapse.desc.nil?
respond_to do |format| respond_to do |format|
if @synapse.update_attributes(synapse_params) if @synapse.update_attributes(synapse_params)