github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 09:57:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Sort needs to be stable.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-12-22 11:45:41 +08:00
parent e3301cd0c8
commit 288e5faf6b
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
View File

@ -81,6 +81,7 @@ createWidget('discourse-poll-voters', {
if (state.loaded === 'loading') { return; }
const { voterIds } = attrs;
if (!voterIds.length) { return; }
const windowSize = Math.round(($('.poll-container:eq(0)').width() / 25) * 2);
@ -137,7 +138,19 @@ createWidget('discourse-poll-standard-results', {
if (options) {
const voters = poll.get('voters');
const ordered = options.sort((a, b) => b.votes - a.votes);
const ordered = options.sort((a, b) => {
if (a.votes < b.votes) {
return 1;
} else if (a.votes == b.votes) {
if (a.html < b.html) {
return -1;
} else {
return 1;
}
} else {
return -1;
}
});
const percentages = voters === 0 ?
Array(ordered.length).fill(0) :