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

Fix: unvisible leading choice when shared polls

Browse Source
This commit is contained in:
cutls 2019-12-13 02:07:33 +09:00
parent af459aa93a
commit f30749d752
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/css/tl.css
View File

@ -705,7 +705,8 @@ p:not(:last-child) {
position: relative; position: relative;
} }
.maxVoter { .maxVoter {
background-color: var(--shared); background-color: var(--emphasized);
filter: brightness(120%);
} }
.ownMark img { .ownMark img {
width: 1.2rem !important; width: 1.2rem !important;

8
app/js/tl/notification.js
View File

@ -80,7 +80,7 @@ function notfColumn(acct_id, tlid, sys) {
if (misskey) { if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute) templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute)
} else { } else {
templete = templete + userparse([obj.account], 'notf', acct_id, tlid, -1) templete = templete + userparse([obj.account], obj.type, acct_id, tlid, -1)
} }
} }
}) })
@ -191,7 +191,7 @@ function notfCommon(acct_id, tlid, sys) {
if (misskey) { if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute) templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
} else { } else {
templete = templete + userparse([obj.account], type, acct_id, 'notf', -1) templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
} }
} }
}) })
@ -240,7 +240,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
if (obj.type != 'follow') { if (obj.type != 'follow') {
templete = parse([obj], 'notf', acct_id, 'notf', popup) templete = parse([obj], 'notf', acct_id, 'notf', popup)
} else { } else {
templete = userparse([obj], 'notf', acct_id, 'notf', popup) templete = userparse([obj], obj.type, acct_id, 'notf', popup)
} }
if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) { if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) {
$('div[data-notf=' + acct_id + ']').prepend(templete) $('div[data-notf=' + acct_id + ']').prepend(templete)
@ -340,7 +340,7 @@ function notfmore(tlid) {
if (misskey) { if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute) templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
} else { } else {
templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1) templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
} }
} }
}) })

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

@ -1175,6 +1175,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
} else if (auth == 'moved') { } else if (auth == 'moved') {
var ftxt = lang.lang_parse_moved var ftxt = lang.lang_parse_moved
} }
console.log(auth, ftxt)
if (popup > 0 || popup == -1 || notf) { if (popup > 0 || popup == -1 || notf) {
var notftext = ftxt + '<br>' var notftext = ftxt + '<br>'
} else { } else {