diff --git a/app/js/login/manager.js b/app/js/login/manager.js index 20ff15a8..9f1ba7b8 100644 --- a/app/js/login/manager.js +++ b/app/js/login/manager.js @@ -252,11 +252,31 @@ function multiDel(target) { var newdom = oldcol.domain } 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) { var add = { domain: newdom, - type: type + type: type, + data: data, + background: background, + text: text, + left_fold: left_fold } newcols.push(add) } diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index 636bb5ce..46912ee1 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -393,8 +393,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { } else { noticeavatar = toot.account.avatar_static } - noticeavatar = `` var rebtxt = lang.lang_parse_btedsimple diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index efc4b857..4dd62c9a 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -650,7 +650,7 @@ function removeColumn(tlid) { var json = JSON.stringify(obj) localStorage.setItem('column', json) sortLoad() - $('#timeline_box_' + tlid + '_parentBox').remove() + $('#timeline_box_' + tlid + '_box').remove() } $('#sort-box').removeClass('hide') $('#sort-box').addClass('show') diff --git a/app/source/version.json b/app/source/version.json index 1b9436b8..d5f2e451 100644 --- a/app/source/version.json +++ b/app/source/version.json @@ -1,5 +1,8 @@ { "latest":[], + "3.1.4": [ + "リモート限定の連合タイムライン" + ], "3.1.3": [], "3.1.2": [], "3.1.1": [],