Commit 20ad9ff8 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '919-overlay-long-name-display-in-the-bar-change' into 'master'

Resolve "overlay long name display in the bar change"

Closes #857 and #919

See merge request !908
parents df8cc024 821de892
Pipeline #13179 passed with stage
in 13 minutes and 38 seconds
......@@ -37,6 +37,8 @@ minerva (14.0.0~beta.0) unstable; urgency=low
that are selectable in the dialog (#911)
* Bug fix: remove of data overlay didn't update numbering of data overlays
that are still in the system (#918)
* Bug fix: too long name for data overlay in info window is trimmed (#919)
* Bug fix: too long name in general overlay list is wrapped (#857)
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 21 Aug 2019 21:00:00 +0200
......
......@@ -245,7 +245,7 @@ OverlayPanel.prototype.createOverlayRow = function (overlay, checked, disabled)
result.className = "active";
}
var nameTd = Functions.createElement({type: "td", content: overlay.getName(), xss: true});
var nameTd = Functions.createElement({type: "td", content: overlay.getName(), className: "word_wrap", xss: true});
result.appendChild(nameTd);
var viewTd = document.createElement("td");
......
......@@ -122,9 +122,13 @@ AliasInfoWindow.prototype.createChartDiv = function (params) {
} else {
rowDiv.className = "minerva-chart-row-odd";
}
var name = overlays[i].getName();
if (name.length > 20) {
name = name.substr(0, 20) + "...";
}
var nameDiv = document.createElement("div");
nameDiv.className = "minerva-chart-name";
nameDiv.innerHTML = overlays[i].getName() + "&nbsp;";
nameDiv.innerHTML = name + "&nbsp;";
rowDiv.appendChild(nameDiv);
if (data !== undefined && data !== null) {
......@@ -526,13 +530,13 @@ AliasInfoWindow.prototype.createVcfString = function (geneVariants) {
if (variant.getVariantIdentifier() !== undefined) {
variantId = variant.getVariantIdentifier();
}
result += variant.getContig() + "\t" +
variant.getPosition() + "\t" +
variantId + "\t" +
variant.getOriginalDna() + "\t" +
variant.getModifiedDna() + "\t" +
"100.0\t" +
"PASS\t" +
result += variant.getContig() + "\t" +
variant.getPosition() + "\t" +
variantId + "\t" +
variant.getOriginalDna() + "\t" +
variant.getModifiedDna() + "\t" +
"100.0\t" +
"PASS\t" +
additionalInfo + "\n";
}
return result;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment