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

Merge pull request #380 from metamaps/bug-labelsDisappearing

Browse source 
when a topic was deleted, renderEdgeArrows was trying to call on a topic...
This commit is contained in:
Connor Turland 2015-01-28 21:35:20 -05:00
parent 40cebf572c d2e9d87037
commit dbfc0e4f4d
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/src/Metamaps.JIT.js
View file

@ -1758,7 +1758,9 @@ Metamaps.JIT = {
var posChild = adj.nodeTo.pos.getc(true); var posChild = adj.nodeTo.pos.getc(true);
//plot arrow edge //plot arrow edge
if (directionCat == "none") { if (!direction) {
// render nothing for this arrow if the direction couldn't be retrieved
} else if (directionCat == "none") {
edgeHelper.line.render({ edgeHelper.line.render({
x: pos.x, x: pos.x,
y: pos.y y: pos.y

11
app/assets/javascripts/src/Metamaps.js
View file

@ -356,10 +356,13 @@ Metamaps.Backbone.init = function () {
return Metamaps.Topics.get(this.get('node2_id')); return Metamaps.Topics.get(this.get('node2_id'));
}, },
getDirection: function () { getDirection: function () {
return [ var t1 = this.getTopic1(),
this.getTopic1().get('node').id, t2 = this.getTopic2();
this.getTopic2().get('node').id
]; return t1 && t2 ? [
t1.get('node').id,
t2.get('node').id
] : false;
}, },
getMapping: function () { getMapping: function () {