Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: Notice "ended" when poll has been ended without your vote

Browse Source
This commit is contained in:
Cutls 2019-06-06 23:42:02 +09:00
parent 26eecd11b6
commit 62f2654358
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/js/tl/parse.js
View File

@ -494,6 +494,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
if (toot.poll.voted) { if (toot.poll.voted) {
var myvote = lang.lang_parse_voted; var myvote = lang.lang_parse_voted;
var result_hide = ""; var result_hide = "";
} else if (toot.poll.expired) {
var myvote = lang.lang_parse_endedvote;
var result_hide = "";
} else { } else {
var myvote = '<a onclick="voteMastodon(\'' + acct_id + '\',\'' + toot.poll.id + '\')" class="votebtn">' + lang.lang_parse_vote + '</a><br>'; var myvote = '<a onclick="voteMastodon(\'' + acct_id + '\',\'' + toot.poll.id + '\')" class="votebtn">' + lang.lang_parse_vote + '</a><br>';
if (choices[0].votes_count === 0 || choices[0].votes_count > 0) { if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
@ -501,11 +504,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
} }
var result_hide = "hide"; var result_hide = "hide";
} }
if (toot.poll.expired) {
var ended = lang.lang_parse_endedvote;
} else {
var ended = date(toot.poll.expires_at, datetype); var ended = date(toot.poll.expires_at, datetype);
}
Object.keys(choices).forEach(function (keyc) { Object.keys(choices).forEach(function (keyc) {
var choice = choices[keyc]; var choice = choices[keyc];
if (!toot.poll.voted && !toot.poll.expired) { if (!toot.poll.voted && !toot.poll.expired) {