Skip to content

Commit 73b5879

Browse files
committed
Sorting: asc/desc order.
1 parent 819e273 commit 73b5879

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

d3-table-cards.js

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,27 @@ function redraw(style){
7676
layout();
7777
}
7878

79+
curSortField='';
80+
curSortDirection=1;
7981
function sort(key){
82+
if(key===curSortField){
83+
curSortDirection = -curSortDirection;
84+
}else{
85+
curSortDirection = 1;
86+
}
8087
var l = getLayoutInfo(curStyle);
81-
data.sort(key=='chakra' ? function (a, b) {
82-
return (a.chakra+a.name).localeCompare(b.chakra+b.name);
83-
} : function (a, b) {
84-
return a.name.localeCompare(b.name);
85-
});
88+
if(key=='chakra'){
89+
data.sort(curSortDirection>0 ? function (a, b) {
90+
return (a.chakra+a.name).localeCompare(b.chakra+b.name);
91+
} : function (a, b) {
92+
return ((8-a.chakra)+a.name).localeCompare((8-b.chakra)+b.name);
93+
});
94+
}else{
95+
data.sort(function (a, b) {
96+
return curSortDirection*a.name.localeCompare(b.name);
97+
});
98+
}
99+
curSortField=key;
86100
layout(false, true);
87101
}
88102

data.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,6 @@ var data=[
194194
"chakra": 4,
195195
"spirit": "Recovery"
196196
}
197-
].sort(function(a,b){
198-
return a.chakra - b.chakra;
197+
].sort(function(a, b){
198+
return (a.chakra+a.name).localeCompare(b.chakra+b.name);
199199
});

0 commit comments

Comments
 (0)