column deleting

This commit is contained in:
cutls 2020-06-10 12:09:17 +09:00
parent da197340ec
commit 907e55e6d7
4 changed files with 27 additions and 4 deletions

View File

@ -252,11 +252,31 @@ function multiDel(target) {
var newdom = oldcol.domain var newdom = oldcol.domain
} }
var type = oldcol.type var type = oldcol.type
var data = null
if(oldcol.data) {
data = oldcol.data
}
var background = null
if(oldcol.background) {
background = oldcol.background
}
var text = null
if(oldcol.text) {
text = oldcol.text
}
var left_fold = false
if(oldcol.left_fold) {
left_fold = true
}
//消した垢のコラムじゃないときコピー //消した垢のコラムじゃないときコピー
if (target != oldcol.domain) { if (target != oldcol.domain) {
var add = { var add = {
domain: newdom, domain: newdom,
type: type type: type,
data: data,
background: background,
text: text,
left_fold: left_fold
} }
newcols.push(add) newcols.push(add)
} }

View File

@ -393,8 +393,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
} else { } else {
noticeavatar = toot.account.avatar_static noticeavatar = toot.account.avatar_static
} }
noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="notf-icon udg" aria-hidden="true"> noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg" aria-hidden="true">
<img draggable="false" src="${noticeavatar}" width="20" class="prof-img" <img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img"
user="${toot.account.acct}" onerror="this.src=\'../../img/loading.svg\'"> user="${toot.account.acct}" onerror="this.src=\'../../img/loading.svg\'">
</a>` </a>`
var rebtxt = lang.lang_parse_btedsimple var rebtxt = lang.lang_parse_btedsimple

View File

@ -650,7 +650,7 @@ function removeColumn(tlid) {
var json = JSON.stringify(obj) var json = JSON.stringify(obj)
localStorage.setItem('column', json) localStorage.setItem('column', json)
sortLoad() sortLoad()
$('#timeline_box_' + tlid + '_parentBox').remove() $('#timeline_box_' + tlid + '_box').remove()
} }
$('#sort-box').removeClass('hide') $('#sort-box').removeClass('hide')
$('#sort-box').addClass('show') $('#sort-box').addClass('show')

View File

@ -1,5 +1,8 @@
{ {
"latest":[], "latest":[],
"3.1.4": [
"リモート限定の連合タイムライン"
],
"3.1.3": [], "3.1.3": [],
"3.1.2": [], "3.1.2": [],
"3.1.1": [], "3.1.1": [],