Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit 36ae3c02 authored by Marc Duez's avatar Marc Duez

list.js : repair and add to menu sortlistbyV / J

parent bd3ce266
......@@ -471,6 +471,10 @@ line {
font-family: monospace;
font-weight: bold;
}
.list_sort {
margin-right: 30px;
float: right;
}
/*style segmenter element*/
.list_select {
width: 445px;
......@@ -517,8 +521,8 @@ line {
.J {
color: #009b95;
}
.highlight_border, .highlight_seq {
.highlight_border,
.highlight_seq {
display: inline-flex;
height: 1em;
position: relative;
......@@ -540,9 +544,9 @@ line {
top: .9em;
padding-bottom: 1px;
opacity: 0.6;
font-size: 70%;
letter-spacing: .428em; /* (1-.7) / .7 */
letter-spacing: .428em;
/* (1-.7) / .7 */
left: .214em;
}
.highlight {
......
......@@ -471,6 +471,10 @@ line {
font-family: monospace;
font-weight: bold;
}
.list_sort {
margin-right: 30px;
float: right;
}
/*style segmenter element*/
.list_select {
width: 445px;
......@@ -517,8 +521,8 @@ line {
.J {
color: #009b95;
}
.highlight_border, .highlight_seq {
.highlight_border,
.highlight_seq {
display: inline-flex;
height: 1em;
position: relative;
......@@ -540,12 +544,11 @@ line {
top: .9em;
padding-bottom: 1px;
opacity: 0.6;
font-size: 70%;
letter-spacing: .428em; /* (1-.7) / .7 */
letter-spacing: .428em;
/* (1-.7) / .7 */
left: .214em;
}
.highlight {
display: inline-block;
width: 0px;
......@@ -798,7 +801,6 @@ span.logo {
width: 475px;
}
.menu-highlight {
display: none;
position: relative;
float: left;
width: 250px;
......
......@@ -582,6 +582,11 @@ line {
font-weight:bold;
}
.list_sort{
margin-right : 30px;
float: right;
}
/*style segmenter element*/
.list_select{
width : 445px;
......
......@@ -218,6 +218,7 @@ Clone.prototype = {
if (typeof (this.germline) != 'undefined') {
return this.germline;
}
return "";
},
......
......@@ -218,6 +218,44 @@ List.prototype = {
a_sort.onclick = function () {
self.sortListBySize()
}
var sort_span = document.createElement('span')
sort_span.className = "list_sort"
var sort = document.createElement('select');
sort.setAttribute('name', 'sort_list[]');
sort.className = "list_sort_select"
sort.onchange = function() {
switch (this.value) {
case "size" :
self.sortListBySize();
break;
case "V" :
self.sortListByV()
break;
case "J" :
self.sortListByJ()
break;
}
}
var sort_option = document.createElement("option");
sort_option.setAttribute('value', "size");
sort_option.appendChild(document.createTextNode("size"));
sort.appendChild(sort_option);
var sort_option = document.createElement("option");
sort_option.setAttribute('value', "V");
sort_option.appendChild(document.createTextNode("V"));
sort.appendChild(sort_option);
var sort_option = document.createElement("option");
sort_option.setAttribute('value', "J");
sort_option.appendChild(document.createTextNode("J"));
sort.appendChild(sort_option);
sort_span.appendChild(document.createTextNode("sort by "));
sort_span.appendChild(sort);
div_list_menu.appendChild(a_split)
div_list_menu.appendChild(a_unsplit)
......@@ -228,7 +266,8 @@ List.prototype = {
div_list_menu.appendChild(filter_label)
div_list_menu.appendChild(filter_input)
div_list_menu.appendChild(filter_reset)
div_list_menu.appendChild(a_sort)
//div_list_menu.appendChild(a_sort)
div_list_menu.appendChild(sort_span)
return div_list_menu
},
......@@ -639,16 +678,27 @@ List.prototype = {
.attr("id");
var idB = $(b)
.attr("id");
var cloneA = self.m.clone(idA)
var cloneB = self.m.clone(idB)
//sort by system
var systemA = cloneA.getSystem()
var systemB = cloneB.getSystem()
if (systemA != systemB) return systemA.localeCompare(systemB);
//sort by V
var vA = cloneA.getV(true)
var vB = cloneB.getV(true)
/*
var oA = 2147483647
var oB = 2147483647
var vA = self.m.clone(idA).getV(true)
if (vA != "undefined V") oA = this.m.germlineV.allele[vA].gene * 1000 + this.m.germlineV.allele[vA].rank
var vB = self.m.clone(idB).getV(true)
if (vB != "undefined V") oB = this.m.germlineV.allele[vB].gene * 1000 + this.m.germlineV.allele[vB].rank
if (vA != "undefined V" & typeof this.m.germlineV.allele[vA] != 'undefined') oA = this.m.germlineV.allele[vA].gene * 1000 + this.m.germlineV.allele[vA].rank
if (vB != "undefined V" & typeof this.m.germlineV.allele[vB] != 'undefined') oB = this.m.germlineV.allele[vB].gene * 1000 + this.m.germlineV.allele[vB].rank
return oA > oB ? 1 : -1;
*/
return vA.localeCompare(vB);
})
$("#list_clones")
.html(sort);
......@@ -663,15 +713,26 @@ List.prototype = {
var idB = $(b)
.attr("id");
var cloneA = self.m.clone(idA)
var cloneB = self.m.clone(idB)
//sort by system
var systemA = cloneA.getSystem()
var systemB = cloneB.getSystem()
if (systemA != systemB) return systemA.localeCompare(systemB);
//sort by J
var jA = cloneA.getJ(true)
var jB = cloneB.getJ(true)
/*
var oA = 2147483647
var oB = 2147483647
var jA = self.m.clone(idA).getJ(true)
if (vA != "undefined V") oA = this.m.germlineJ.allele[jA].gene * 1000 + this.m.germlineJ.allele[jA].rank
var jB = self.m.clone(idB).getJ(true)
if (vB != "undefined V") oB = this.m.germlineJ.allele[jB].gene * 1000 + this.m.germlineJ.allele[jB].rank
if (jA != "undefined V" & typeof this.m.germlineJ.allele[jA] != 'undefined') oA = this.m.germlineJ.allele[jA].gene * 1000 + this.m.germlineJ.allele[jA].rank
if (jB != "undefined V" & typeof this.m.germlineJ.allele[jB] != 'undefined') oB = this.m.germlineJ.allele[jB].gene * 1000 + this.m.germlineJ.allele[jB].rank
return oA > oB ? 1 : -1;
*/
return jA.localeCompare(jB);
})
$("#list_clones")
.html(sort);
......
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