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

Merge remote-tracking branch 'origin/develop' into new

Browse source
This commit is contained in:
Tadasu85 2014-08-02 13:51:54 -04:00
commit 581ba8b78f
2 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/assets/javascripts/metamaps/metamaps.js
View file

@ -132,13 +132,6 @@ Metamaps.Backbone.init = function () {
topic_id: this.isNew() ? this.cid : this.id topic_id: this.isNew() ? this.cid : this.id
}); });
}, },
updateMapping: function () {
var mapping = this.getMapping();
if (mapping) {
mapping.set('topic_id', this.id);
}
},
createNode: function () { createNode: function () {
var mapping; var mapping;
var node = { var node = {
@ -229,13 +222,6 @@ Metamaps.Backbone.init = function () {
synapse_id: this.isNew() ? this.cid : this.id synapse_id: this.isNew() ? this.cid : this.id
}); });
}, },
updateMapping: function () {
var mapping = this.getMapping();
if (mapping) {
mapping.set('synapse_id', this.id);
}
},
createEdge: function () { createEdge: function () {
var mapping, mappingID; var mapping, mappingID;
var synapseID = this.isNew() ? this.cid : this.id; var synapseID = this.isNew() ? this.cid : this.id;
@ -2261,8 +2247,8 @@ Metamaps.Topic = {
} else { } else {
Metamaps.Visualize.mGraph.loadJSON(newnode); Metamaps.Visualize.mGraph.loadJSON(newnode);
nodeOnViz = Metamaps.Visualize.mGraph.graph.getNode(newnode.id); nodeOnViz = Metamaps.Visualize.mGraph.graph.getNode(newnode.id);
mapping.set('node', nodeOnViz); topic.set('node', nodeOnViz);
mapping.updateNode(); // links the topic and the mapping to the node topic.updateNode(); // links the topic and the mapping to the node
nodeOnViz.setData("dim", 1, "start"); nodeOnViz.setData("dim", 1, "start");
nodeOnViz.setData("dim", 25, "end"); nodeOnViz.setData("dim", 25, "end");
@ -2283,9 +2269,8 @@ Metamaps.Topic = {
if (topic.isNew()) { if (topic.isNew()) {
topic.save(null, { topic.save(null, {
success: function (topicModel, response) { success: function (topicModel, response) {
topicModel.updateMapping();
if (Metamaps.Active.Map) { if (Metamaps.Active.Map) {
mapping.save(); mapping.save({ topic_id: topicModel.id });
} }
}, },
error: function (model, response) { error: function (model, response) {
@ -2401,9 +2386,8 @@ Metamaps.Synapse = {
if (synapse.isNew()) { if (synapse.isNew()) {
synapse.save(null, { synapse.save(null, {
success: function (synapseModel, response) { success: function (synapseModel, response) {
synapseModel.updateMapping();
if (Metamaps.Active.Map) { if (Metamaps.Active.Map) {
mapping.save(); mapping.save({ synapse_id: synapseModel.id });
} }
}, },
error: function (model, response) { error: function (model, response) {

3
app/views/main/home.html.erb
View file

@ -101,11 +101,10 @@ $(document).ready(function() {
<div class="mapOrder"> <div class="mapOrder">
<span class="displaying">Displaying:</span> <span class="displaying">Displaying:</span>
<div class="whichMaps"> <div class="whichMaps">
<a href="/maps/mappers/<%= @current.id %>" class="active">Yours</a> /
<a href="/explore/active">Recently Active</a> / <a href="/explore/active">Recently Active</a> /
<a href="/explore/featured">Featured</a> / <a href="/explore/featured">Featured</a> /
<a href="/explore/new">Newest First</a> <a href="/explore/new">Newest First</a>
/ <a href="/maps/mappers/<%= @current.id %>" class="active">Yours</a>
</div> </div>
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>