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

Merge branch 'master' of github.com:metamaps/metamaps_gen002 into prevent.scrolling

Browse source
This commit is contained in:
Connor Turland 2015-01-28 21:39:33 -05:00
parent 5d9305fb11 dbfc0e4f4d
commit 5a31c91597
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/lib/embedly.js
View file

File diff suppressed because one or more lines are too long

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

@ -1758,7 +1758,9 @@ Metamaps.JIT = {
var posChild = adj.nodeTo.pos.getc(true);
//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({
x: pos.x,
y: pos.y

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

@ -356,10 +356,13 @@ Metamaps.Backbone.init = function () {
return Metamaps.Topics.get(this.get('node2_id'));
},
getDirection: function () {
return [
this.getTopic1().get('node').id,
this.getTopic2().get('node').id
];
var t1 = this.getTopic1(),
t2 = this.getTopic2();
return t1 && t2 ? [
t1.get('node').id,
t2.get('node').id
] : false;
},
getMapping: function () {
@ -893,7 +896,6 @@ Metamaps.TopicCard = {
});
var embedlyEl = $('<a/>', {
id: 'embedlyLink',
'data-card-chrome': '0',
'data-card-description': '0',
href: text
}).html(text);
@ -1176,7 +1178,7 @@ Metamaps.TopicCard = {
nodeValues.attachmentsHidden = '';
if (topic.get('link') && topic.get('link')!== '') {
nodeValues.embeds = '<a href="' + topic.get('link') + '" id="embedlyLink" target="_blank" data-card-chrome="0" data-card-description="0">';
nodeValues.embeds = '<a href="' + topic.get('link') + '" id="embedlyLink" target="_blank" data-card-description="0">';
nodeValues.embeds += topic.get('link');
nodeValues.embeds += '</a><div id="embedlyLinkLoader"></div>';
nodeValues.attachmentsHidden = 'hidden';