closes #338 ugly text labels. fixes error when trying to load topic page with a metacode set selected
This commit is contained in:
parent
bfa25bc604
commit
c567f07a50
3 changed files with 11 additions and 4 deletions
app
|
@ -205,6 +205,8 @@ function selectNodeOnClickHandler(node, e) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log(e);
|
||||||
|
|
||||||
var check = nodeWasDoubleClicked();
|
var check = nodeWasDoubleClicked();
|
||||||
if (check) {
|
if (check) {
|
||||||
nodeDoubleClickHandler(node, e);
|
nodeDoubleClickHandler(node, e);
|
||||||
|
|
|
@ -7293,7 +7293,7 @@ Graph.Label.Native = new Class({
|
||||||
// START METAMAPS CODE
|
// START METAMAPS CODE
|
||||||
var index;
|
var index;
|
||||||
for (index = 0; index < customLabel.length; ++index) {
|
for (index = 0; index < customLabel.length; ++index) {
|
||||||
ctx.fillText(customLabel[index], pos.x, pos.y + node.getData("height") + 5 + (25*index));
|
ctx.fillText(customLabel[index], pos.x, pos.y + node.getData("height") + 8 + (25*index));
|
||||||
}
|
}
|
||||||
// END METAMAPS CODE
|
// END METAMAPS CODE
|
||||||
},
|
},
|
||||||
|
|
|
@ -9,9 +9,14 @@
|
||||||
<div class="openMetacodeSwitcher openLightbox" data-open="switchMetacodes"></div>
|
<div class="openMetacodeSwitcher openLightbox" data-open="switchMetacodes"></div>
|
||||||
<div id="metacodeImg">
|
<div id="metacodeImg">
|
||||||
<% @m = user.settings.metacodes %>
|
<% @m = user.settings.metacodes %>
|
||||||
<% @metacodes = [] %>
|
<% set = @m[0].include?("metacodeset") ? MetacodeSet.find(@m[0].sub("metacodeset-","").to_i) : false %>
|
||||||
<% @m.each do |m| %>
|
<% if set %>
|
||||||
<% @metacodes.push(Metacode.find(m.to_i)) %>
|
<% @metacodes = set.metacodes %>
|
||||||
|
<% else %>
|
||||||
|
<% @metacodes = [] %>
|
||||||
|
<% @m.each do |m| %>
|
||||||
|
<% @metacodes.push(Metacode.find(m.to_i)) %>
|
||||||
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% @metacodes.sort! {|m1,m2| m2.name.downcase <=> m1.name.downcase }.rotate!(-1) %>
|
<% @metacodes.sort! {|m1,m2| m2.name.downcase <=> m1.name.downcase }.rotate!(-1) %>
|
||||||
<% @metacodes.each do |metacode| %>
|
<% @metacodes.each do |metacode| %>
|
||||||
|
|
Loading…
Reference in a new issue