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

I8d TL streaming

Browse Source
This commit is contained in:
cutls 2020-09-07 19:06:57 +09:00
parent 9623b79197
commit 69d60a7372
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/css/tl.css
View File

@ -451,6 +451,13 @@ iframe,
.action .fa-quote-right { .action .fa-quote-right {
margin-top: 0.15rem; margin-top: 0.15rem;
} }
.actct {
color: var(--beforehover);
}
.actct:hover {
color: var(--color);
transition: 0.5s;
}
.contextMenu.dropdown-content { .contextMenu.dropdown-content {
padding-top: 5px; padding-top: 5px;
overflow-y: hidden; overflow-y: hidden;

6
app/js/tl/mix.js
View File

@ -19,11 +19,11 @@ async function mixtl(acct_id, tlid, type, delc, voice) {
additional(acct_id, tlid) additional(acct_id, tlid)
jQuery('time.timeago').timeago() jQuery('time.timeago').timeago()
todc() todc()
if(mastodonBaseWsStatus[domain] == 'cannnotopen') { if(mastodonBaseWsStatus[domain] == 'cannotuse') {
mixre(acct_id, tlid, 'mix', mute, voice, '') mixre(acct_id, tlid, 'mix', mute, voice, '')
} else if(mastodonBaseWs[domain] == 'undetected') { } else if (mastodonBaseWsStatus[domain] == 'undetected' || mastodonBaseWsStatus[domain] == 'connecting') {
const mbws = setInterval(function () { const mbws = setInterval(function () {
if(mastodonBaseWsStatus[domain] == 'cannnotopen') { if(mastodonBaseWsStatus[domain] == 'cannotuse') {
mixre(acct_id, tlid, 'mix', mute, voice, '') mixre(acct_id, tlid, 'mix', mute, voice, '')
clearInterval(mbws) clearInterval(mbws)
} else if(mastodonBaseWsStatus[domain] == 'available') { } else if(mastodonBaseWsStatus[domain] == 'available') {

2
app/js/ui/layout.js
View File

@ -149,7 +149,6 @@ function parseColumn(target, dontclose) {
icnsert = ' style="color: #' + ichex + '" ' icnsert = ' style="color: #' + ichex + '" '
} }
} }
console.log(acct)
if (acctlist[acct.domain]) { if (acctlist[acct.domain]) {
if (acctlist[acct.domain].background != 'def') { if (acctlist[acct.domain].background != 'def') {
insert = insert + ' border-bottom:medium solid #' + acctlist[acct.domain].background + ';' insert = insert + ' border-bottom:medium solid #' + acctlist[acct.domain].background + ';'
@ -363,7 +362,6 @@ function parseColumn(target, dontclose) {
var addHeight = '' var addHeight = ''
} }
if (acct.type != 'pub' && acct.type != 'pub-media') { if (acct.type != 'pub' && acct.type != 'pub-media') {
console.log(acct.type, key)
var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex"> var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex">
<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i> <i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
<span id="sta-media-${key}">On</span> <span id="sta-media-${key}">On</span>