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

Fix up import - want more backboney event listening though

Browse source
This commit is contained in:
Devin Howard 2016-03-27 11:46:58 +08:00
parent ae9f4a51a2
commit f9e6249615
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/assets/javascripts/src/Metamaps.Import.js.erb
View file

@ -34,14 +34,17 @@ Metamaps.Import = {
init: function() { init: function() {
var self = Metamaps.Import; var self = Metamaps.Import;
$('body').bind('paste', function(e) { $('body').bind('paste', function(e) {
if (e.target.tagName === "INPUT") return;
var text = e.originalEvent.clipboardData.getData('text/plain'); var text = e.originalEvent.clipboardData.getData('text/plain');
var results; var results;
if (text[0] === '{') { if (text[0] === '{') {
try { try {
results = JSON.parse(text); results = JSON.parse(text);
} catch (Error e) { } catch (e) {
results = false; results = false;
} }
} else { } else {
@ -63,7 +66,6 @@ Metamaps.Import = {
}, },
abort: function(message) { abort: function(message) {
alert("Sorry, something went wrong!\n\n" + message);
console.error(message); console.error(message);
}, },
@ -283,20 +285,28 @@ Metamaps.Import = {
var topic2 = Metamaps.Topics.get(self.cidMappings[node2_id]); var topic2 = Metamaps.Topics.get(self.cidMappings[node2_id]);
var node1 = topic1.get('node'); var node1 = topic1.get('node');
var node2 = topic2.get('node'); var node2 = topic2.get('node');
// TODO check if topic1 and topic2 were sucessfully found...
if (topic1.isNew() || topic2.isNew()) {
return setTimeout(function() {
self.createSynapseWithParameters(description, category, permission,
node1_id, node2_id)
}, 200);
}
var synapse = new Metamaps.Backbone.Synapse({ var synapse = new Metamaps.Backbone.Synapse({
desc: description, desc: description,
category: category, category: category,
permission: permission, permission: permission,
node1_id: node1.id, node1_id: topic1.id,
node2_id: node2.id, node2_id: topic2.id
}); });
Metamaps.Synapses.add(synapse);
var mapping = new Metamaps.Backbone.Mapping({ var mapping = new Metamaps.Backbone.Mapping({
mappable_type: "Synapse", mappable_type: "Synapse",
mappable_id: synapse.id, mappable_id: synapse.cid,
}); });
Metamaps.Mappings.add(mapping);
Metamaps.Synapse.renderSynapse(mapping, synapse, node1, node2, true); Metamaps.Synapse.renderSynapse(mapping, synapse, node1, node2, true);
}, },

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

@ -4683,7 +4683,7 @@ Metamaps.Synapse = {
node1 = synapsesToCreate[i]; node1 = synapsesToCreate[i];
topic1 = node1.getData('topic'); topic1 = node1.getData('topic');
synapse = new Metamaps.Backbone.Synapse({ synapse = new Metamaps.Backbone.Synapse({
desc: Metamaps.Create.newSynapse.description,// || "", desc: Metamaps.Create.newSynapse.description,
node1_id: topic1.isNew() ? topic1.cid : topic1.id, node1_id: topic1.isNew() ? topic1.cid : topic1.id,
node2_id: topic2.isNew() ? topic2.cid : topic2.id, node2_id: topic2.isNew() ? topic2.cid : topic2.id,
}); });