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

Merge pull request #292 from heguro/fix-could-not-see-column-list

Browse Source 
Fix: cannot sort column if using some kind of TL
This commit is contained in:
Cutls 2020-05-24 16:07:14 +09:00 committed by GitHub
commit 874be5bca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/js/tl/tl.js
View File

@ -851,7 +851,7 @@ function cap(type, data, acct_id) {
} else if (type == 'bookmark') { } else if (type == 'bookmark') {
var response = 'Bookmarks' var response = 'Bookmarks'
} else if (type == 'utl') { } else if (type == 'utl') {
var response = 'User TL(' + data.acct + ')' var response = 'User TL(' + escapeHTML(data.acct) + ')'
} }
return response return response
} }

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

@ -33,7 +33,7 @@ function sortLoad () {
var acctdata = user + "@" + domain; var acctdata = user + "@" + domain;
} }
var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, escapeHTML(acct.data), acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key + var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, acct.data, acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key +
')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_sort_gothis + '">forward</i></a> <a onclick="removeColumn(' + key + ')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_sort_gothis + '">forward</i></a> <a onclick="removeColumn(' + key +
')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">' + acctdata + '</div></li>'; ')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">' + acctdata + '</div></li>';
$("#sort").append(html); $("#sort").append(html);