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

improve some styles with rounded-button

Browse Source
This commit is contained in:
cutls 2021-05-20 15:16:58 +09:00
parent 8acf86d9cb
commit 723ff59a21
19 changed files with 276 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/about.html
View File

@ -105,7 +105,7 @@
</div> </div>
<div class="cp"> <div class="cp">
Copyright &copy; TheDesk 2018<br /> Copyright &copy; TheDesk 2018<br />
Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br /> Main developer(author): <a href="https://1m.cutls.com/@Cutls" target="_blank">Cutls P</a><br />
Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a
href="https://pl.kpherox.dev/kPherox" href="https://pl.kpherox.dev/kPherox"
target="_blank" target="_blank"

43
app/css/master.css
View File

@ -28,7 +28,9 @@ html {
text-transform: none; text-transform: none;
height: 2.76rem; height: 2.76rem;
line-height: 2.76rem; line-height: 2.76rem;
border-radius: 0.5rem;
} }
.markdown { .markdown {
display: none; display: none;
} }
@ -88,7 +90,7 @@ option {
#imagewrap { #imagewrap {
width: 100%; width: 100%;
height: 100%; height: calc(100% - 4px);
} }
#imagewrap img.rotate-90 { #imagewrap img.rotate-90 {
transform: rotate(-90deg); transform: rotate(-90deg);
@ -234,6 +236,12 @@ blockquote:before,
right: 0; right: 0;
top: 0; top: 0;
} }
.menu-icon {
font-size: 1.4rem !important;
top: 0.3rem;
line-height: 1rem !important;
position: relative;
}
#start { #start {
display: none; display: none;
position: fixed; position: fixed;
@ -329,8 +337,26 @@ blockquote:before,
.collapsible-header:focus { .collapsible-header:focus {
background-color: var(--thirdColor) !important; background-color: var(--thirdColor) !important;
} }
.modal-footer { .modal .modal-footer {
background-color: var(--modalfooter) !important; background-color: var(--modalfooter) !important;
border-radius: 0;
padding: 0;
}
.modal {
border-radius: 1.5rem;
}
.progress .determinate,
.progress .indeterminate {
background-color: var(--active);
}
.nomargin {
margin: 0;
}
#imginfo {
float: left;
padding-top: 0.23rem;
line-height: normal;
padding-left: 1rem;
} }
.font { .font {
font-size: 1.5rem; font-size: 1.5rem;
@ -342,7 +368,8 @@ blockquote:before,
.release-do { .release-do {
border: solid 2px; border: solid 2px;
border-color: var(--text); border-color: var(--text);
padding: 5px; padding: 1.5rem;
border-radius: 0.5rem;
} }
#pickers { #pickers {
display: flex; display: flex;
@ -392,7 +419,8 @@ input[type='color']::-webkit-color-swatch {
color: var(--text); color: var(--text);
} }
#left-menu a:hover { #left-menu a:hover {
background-color: var(--beforehover); background-color: var(--emphasized);
filter: brightness(80%);
} }
#left-menu span { #left-menu span {
margin-left: 0.4rem; margin-left: 0.4rem;
@ -401,7 +429,9 @@ input[type='color']::-webkit-color-swatch {
background-color: var(--emphasized); background-color: var(--emphasized);
} }
#left-menu a.active span { #left-menu a.active span {
text-decoration: underline; text-decoration: none;
border-bottom: 1px solid;
padding-bottom: 0.5px;
} }
#right-menu { #right-menu {
width: 100%; width: 100%;
@ -436,7 +466,8 @@ input[type='color']::-webkit-color-swatch {
overflow: hidden; overflow: hidden;
} }
#tltype .type:hover { #tltype .type:hover {
background-color: var(--beforehover); background-color: var(--emphasized);
filter: brightness(80%);
} }
#tltype .active { #tltype .active {
background-color: var(--emphasized); background-color: var(--emphasized);

17
app/css/tl.css
View File

@ -391,6 +391,8 @@ iframe,
overflow: hidden; overflow: hidden;
max-width: calc(100% - 150px); max-width: calc(100% - 150px);
display: inline-block; display: inline-block;
position: relative;
top: 0.2rem;
} }
.cusr { .cusr {
user-select: text; user-select: text;
@ -416,6 +418,12 @@ iframe,
margin-top: 0.46rem; margin-top: 0.46rem;
margin-left: 0.46rem; margin-left: 0.46rem;
} }
.landing {
text-align: center;
display: flex;
flex-direction: column;
align-items: center;
}
.quote-inline { .quote-inline {
display: none; display: none;
@ -449,6 +457,12 @@ iframe,
.btn-flat { .btn-flat {
color: var(--text); color: var(--text);
} }
.sublink {
font-size: 1.4rem !important;
position: relative;
top: 0.4rem;
cursor: pointer;
}
.area-side i { .area-side i {
margin-left: 0.75rem; margin-left: 0.75rem;
} }
@ -459,6 +473,9 @@ iframe,
font-size: 1.2rem; font-size: 1.2rem;
margin-right: 0.15rem; margin-right: 0.15rem;
} }
.action li i {
margin-right: 0.5rem;
}
.action .fa-quote-right { .action .fa-quote-right {
margin-top: 0.15rem; margin-top: 0.15rem;
} }

10
app/css/userdata.css
View File

@ -25,7 +25,6 @@
#his-float-data { #his-float-data {
height: 100%; height: 100%;
overflow-y: hidden; overflow-y: hidden;
} }
#his-leftside { #his-leftside {
width: 28.4rem; width: 28.4rem;
@ -33,7 +32,7 @@
} }
#his-float-timeline { #his-float-timeline {
max-width: 47.5rem; max-width: 47.5rem;
min-width: calc(100% - 29.4rem); width: calc(100% - 28.4rem);
height: 100%; height: 100%;
overflow-y: hidden; overflow-y: hidden;
} }
@ -150,7 +149,7 @@
background-color: var(--bg); background-color: var(--bg);
} }
#hisdropdown li a { #hisdropdown li a {
color: white; color: var(--text);
} }
#hisdropdown li:hover { #hisdropdown li:hover {
background-color: var(--active); background-color: var(--active);
@ -165,6 +164,9 @@
} }
#his-data-title .material-icons { #his-data-title .material-icons {
position: relative; position: relative;
top: 7px; top: 5px;
margin-right: 3px; margin-right: 3px;
} }
#his-data-title a {
color: white;
}

36
app/js/common/version.js
View File

@ -5,20 +5,6 @@ function verck(ver, jp) {
$('body').addClass(localStorage.getItem('platform')) $('body').addClass(localStorage.getItem('platform'))
var date = new Date() var date = new Date()
var showVer = false var showVer = false
//Spotify
if (localStorage.getItem('spotify')) {
localStorage.removeItem('spotify')
localStorage.removeItem('spotify-refresh')
var spDc = 'Spotify NowPlaying sysytem was changed, please re-login to Spotify'
if(lang.language == 'ja') {
spDc = 'Spotify NowPlayingの機能が変更されたため、もう一度ログインしてください'
}
Swal.fire({
type: 'info',
title: spDc,
})
}
//Spotify(e)
if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) { if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
showVer = true showVer = true
console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;') console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
@ -44,9 +30,18 @@ function verck(ver, jp) {
localStorage.setItem('ver', ver) localStorage.setItem('ver', ver)
if (!showVer) { if (!showVer) {
console.log(showVer) console.log(showVer)
if (!localStorage.getItem('showSupportMe')) {
if (date.getMonth() == 11) {
var yrs = date.getFullYear() + 1
var nextmonth = yrs * 100 + 1
} else {
var yrs = date.getFullYear()
var nextmonth = yrs * 100 + date.getMonth() + 2
}
localStorage.setItem('showSupportMe', nextmonth)
} else {
if ( if (
date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') || date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe')
!localStorage.getItem('showSupportMe')
) { ) {
if (date.getMonth() == 11) { if (date.getMonth() == 11) {
var yrs = date.getFullYear() + 1 var yrs = date.getFullYear() + 1
@ -55,11 +50,11 @@ function verck(ver, jp) {
var yrs = date.getFullYear() var yrs = date.getFullYear()
var nextmonth = yrs * 100 + date.getMonth() + 2 var nextmonth = yrs * 100 + date.getMonth() + 2
} }
localStorage.setItem('showSupportMe', nextmonth)
if (lang.language != 'ja') { if (lang.language != 'ja') {
$('#support-btm-ja').addClass('hide') $('#support-btm-ja').addClass('hide')
$('#support-btm-en').removeClass('hide') $('#support-btm-en').removeClass('hide')
} }
localStorage.setItem('showSupportMe', nextmonth)
$('#support-btm').removeClass('hide') $('#support-btm').removeClass('hide')
$('#support-btm').animate( $('#support-btm').animate(
{ {
@ -71,6 +66,8 @@ function verck(ver, jp) {
) )
} }
} }
}
var platform = localStorage.getItem('platform') var platform = localStorage.getItem('platform')
console.log('Your platform:' + platform) console.log('Your platform:' + platform)
//if (!localStorage.getItem('winstore') && !pwa) { //if (!localStorage.getItem('winstore') && !pwa) {
@ -114,11 +111,6 @@ function verck(ver, jp) {
.then(function(mess) { .then(function(mess) {
console.table(mess) console.table(mess)
if (mess) { if (mess) {
//askjp_jp_ua: 2019年10月24日、mstdn.jpによるユーザーエージェントアクセス制限
if (jp && mess.jp_ua && !localStorage.getItem('askjp_jp_ua')) {
localStorage.setItem('askjp_jp_ua', true)
$('#askjp_jp_ua').removeClass('hide')
}
var platform = localStorage.getItem('platform') var platform = localStorage.getItem('platform')
if (platform == 'darwin') { if (platform == 'darwin') {
var newest = mess.desk_mac var newest = mess.desk_mac

2
app/js/post/emoji.js
View File

@ -19,7 +19,7 @@ function emojiToggle(reaction) {
if (width) { if (width) {
width = width.replace('px', '') * 1 + 300 width = width.replace('px', '') * 1 + 300
} else { } else {
width = 600 width = reaction ? 300 : 600
} }
$('#post-box').css('width', width + 'px') $('#post-box').css('width', width + 'px')
$('#suggest').html('') $('#suggest').html('')

4
app/js/tl/directory.js
View File

@ -38,9 +38,10 @@ function directory(isMore) {
} }
if (isMore) { if (isMore) {
var addOffset = $("#dir-contents .cvo").length var addOffset = $("#dir-contents .cvo").length
$("#dir-contents").append(`<div class="progress transparent"><div class="indeterminate"></div></div>`)
} else { } else {
var addOffset = 0 var addOffset = 0
$("#dir-contents").html("") $("#dir-contents").html(`<div class="progress transparent"><div class="indeterminate"></div></div>`)
} }
var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset
console.log(start) console.log(start)
@ -52,6 +53,7 @@ function directory(isMore) {
} }
}) })
.then(function (response) { .then(function (response) {
$("#dir-contents .progress").remove()
if (!response.ok) { if (!response.ok) {
response.text().then(function (text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)

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

@ -44,6 +44,7 @@ function notfColumn(acct_id, tlid, sys) {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response var json = httpreq.response
if (this.status !== 200) { if (this.status !== 200) {
$('#landing_' + tlid).append(`<div>${this.status}</div><div>${escapeHTML(this.response)}`)
setLog(start, this.status, this.response) setLog(start, this.status, this.response)
} }
var max_id = httpreq.getResponseHeader('link') var max_id = httpreq.getResponseHeader('link')
@ -88,7 +89,7 @@ function notfColumn(acct_id, tlid, sys) {
}) })
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>' templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
$('#timeline_' + tlid).html(templete) $('#timeline_' + tlid).html(templete)
$('#landing_' + tlid).hide() // $('#landing_' + tlid).hide()
jQuery('time.timeago').timeago() jQuery('time.timeago').timeago()
} }
$('#notf-box').addClass('fetched') $('#notf-box').addClass('fetched')
@ -156,6 +157,8 @@ function notfCommon(acct_id, tlid, sys, stream) {
console.log('header to get param:' + response.headers.get('link')) console.log('header to get param:' + response.headers.get('link'))
if (!response.ok) { if (!response.ok) {
response.text().then(function(text) { response.text().then(function(text) {
console.log('notf error', 'div[data-notf=' + acct_id + '] .landing')
$('div[data-notf=' + acct_id + '] .landing').append(`<div>${response.status}</div><div>${escapeHTML(text)}`)
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
@ -202,7 +205,7 @@ function notfCommon(acct_id, tlid, sys, stream) {
} }
}) })
$('div[data-notf=' + acct_id + ']').html(templete) $('div[data-notf=' + acct_id + ']').html(templete)
$('#landing_' + tlid).hide() // $('#landing_' + tlid).hide()
jQuery('time.timeago').timeago() jQuery('time.timeago').timeago()
} }
$('#notf-box').addClass('fetched') $('#notf-box').addClass('fetched')
@ -232,6 +235,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
$('i[data-notf=' + acct_id + ']').removeClass('red-text') $('i[data-notf=' + acct_id + ']').removeClass('red-text')
} }
websocketNotf[acct_id].onmessage = function(mess) { websocketNotf[acct_id].onmessage = function(mess) {
$('#landing_' + tlid).hide()
//console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]); //console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
var popup = localStorage.getItem('popup') var popup = localStorage.getItem('popup')
if (!popup) { if (!popup) {
@ -356,7 +360,7 @@ function notfmore(tlid) {
moreloading = false moreloading = false
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>' templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
$('#timeline_' + tlid).append(templete) $('#timeline_' + tlid).append(templete)
$('#landing_' + tlid).hide() // $('#landing_' + tlid).hide()
jQuery('time.timeago').timeago() jQuery('time.timeago').timeago()
} }
$('#notf-box').addClass('fetched') $('#notf-box').addClass('fetched')

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

@ -631,7 +631,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
var mty = media.remote_url.match(/.+(\..+)$/)[1] var mty = media.remote_url.match(/.+(\..+)$/)[1]
viewer = viewer =
viewer + viewer +
`<a href="${media.url ? media.url : media.remote_url}" title="${media.remote_url} from ${media.url}">[${lang.lang_parse_unknown}(${mty})]</a> ` `<a href="${media.url ? media.url : media.remote_url}" title="${media.url ? media.url : media.remote_url}">[${lang.lang_parse_unknown}(${mty})]</a>${media.url ? `<a href="${media.remote_url}"><i class="material-icons sublink" title="${media.remote_url}">open_in_new</i></a>` : ''} `
} else if (media.type == 'audio') { } else if (media.type == 'audio') {
viewer = viewer =
viewer + viewer +
@ -1552,6 +1552,7 @@ function mastodonBaseStreaming(acct_id) {
$('.notice_icon_acct_' + acct_id).removeClass('red-text') $('.notice_icon_acct_' + acct_id).removeClass('red-text')
} }
mastodonBaseWs[domain].onmessage = function (mess) { mastodonBaseWs[domain].onmessage = function (mess) {
$(`div[data-acct=${acct_id}] .landing`).hide()
const typeA = JSON.parse(mess.data).event const typeA = JSON.parse(mess.data).event
if (typeA == 'delete') { if (typeA == 'delete') {
$(`[unique-id=${JSON.parse(mess.data).payload}]`).hide() $(`[unique-id=${JSON.parse(mess.data).payload}]`).hide()

19
app/js/tl/src.js
View File

@ -13,7 +13,21 @@ function searchMenu() {
//検索取得 //検索取得
function src(mode, offset) { function src(mode, offset) {
if (!offset) { if (!offset) {
$('#src-contents').html('') $('#src-contents').html(`
<div class="preloader-wrapper small active" style="margin-left: calc(50% - 36px);">
<div class="spinner-layer spinner-blue-only">
<div class="circle-clipper left">
<div class="circle"></div>
</div>
<div class="gap-patch">
<div class="circle"></div>
</div>
<div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
</div>
`)
var add = '' var add = ''
} else { } else {
var add = '&type=accounts&offset=' + $('#src-accts .cvo').length var add = '&type=accounts&offset=' + $('#src-accts .cvo').length
@ -49,6 +63,9 @@ function src(mode, offset) {
} }
}) })
.then(function (response) { .then(function (response) {
if (!offset) {
$('#src-contents').html(``)
}
if (!response.ok) { if (!response.ok) {
response.text().then(function (text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)

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

@ -10,6 +10,7 @@ if (location.search) {
} }
//よく使うタグ //よく使うタグ
function tagShow(tag, elm) { function tagShow(tag, elm) {
tag = decodeURIComponent(tag)
const tagTL = lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag) const tagTL = lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)
const tagPin = lang.lang_parse_tagpin.replace('{{tag}}', '#' + tag) const tagPin = lang.lang_parse_tagpin.replace('{{tag}}', '#' + tag)
const tagToot = lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag) const tagToot = lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)

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

@ -182,6 +182,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
.then(function (response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
response.text().then(function (text) { response.text().then(function (text) {
$('#landing_' + tlid).append(`<div>${response.status}</div><div>${escapeHTML(text)}`)
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
} }
@ -193,6 +194,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
console.error(error) console.error(error)
}) })
.then(function (json) { .then(function (json) {
if(!json) return true
console.log(['Result of getting timeline of ' + tlid, json]) console.log(['Result of getting timeline of ' + tlid, json])
$('#landing_' + tlid).hide() $('#landing_' + tlid).hide()
var mute = getFilterTypeByAcct(acct_id, type) var mute = getFilterTypeByAcct(acct_id, type)

10
app/js/ui/img.js
View File

@ -77,6 +77,9 @@ function imgCont(type) {
} }
function imageXhr(id, key, murl) { function imageXhr(id, key, murl) {
var startTime = new Date() var startTime = new Date()
$('#imgmodal-progress div').removeClass('determinate')
$('#imgmodal-progress div').addClass('indeterminate')
$('#imgmodal-progress').removeClass('hide')
xhr = new XMLHttpRequest() xhr = new XMLHttpRequest()
xhr.open('GET', murl, true) xhr.open('GET', murl, true)
xhr.responseType = 'arraybuffer' xhr.responseType = 'arraybuffer'
@ -87,6 +90,9 @@ function imageXhr(id, key, murl) {
var total = event.total var total = event.total
var now = event.loaded var now = event.loaded
var per = (now / total) * 100 var per = (now / total) * 100
$('#imgmodal-progress div').removeClass('indeterminate')
$('#imgmodal-progress div').addClass('determinate')
$('#imgmodal-progress div').css('width', `${per}%`)
$('#imgprog').text(Math.floor(per)) $('#imgprog').text(Math.floor(per))
} }
}, },
@ -100,6 +106,10 @@ function imageXhr(id, key, murl) {
var now = event.loaded var now = event.loaded
var per = (now / total) * 100 var per = (now / total) * 100
$('#imgprog').text(Math.floor(per)) $('#imgprog').text(Math.floor(per))
$('#imgmodal-progress').addClass('hide')
$('#imgmodal-progress div').css('width', '0%')
$('#imgmodal-progress div').removeClass('determinate')
$('#imgmodal-progress div').addClass('indeterminate')
}, },
false false
) )

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

@ -452,8 +452,20 @@ function parseColumn(target, dontclose) {
<div class="tl-box" tlid="${key}"> <div class="tl-box" tlid="${key}">
<div id="timeline_${key}" class="tl ${acct.type}-timeline " tlid="${key}" <div id="timeline_${key}" class="tl ${acct.type}-timeline " tlid="${key}"
data-type="${acct.type}" data-acct="${acct.domain}" data-const="${acct.type}_${acct.domain}"> data-type="${acct.type}" data-acct="${acct.domain}" data-const="${acct.type}_${acct.domain}">
<div id="landing_${key}" style="text-align:center"> <div id="landing_${key}" class="landing">
${lang.lang_layout_nodata} <div class="preloader-wrapper small active " style="margin-top: calc(50vh - 15px)">
<div class="spinner-layer spinner-blue-only">
<div class="circle-clipper left">
<div class="circle"></div>
</div>
<div class="gap-patch">
<div class="circle"></div>
</div>
<div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div>` </div>`

17
app/js/userdata/showOnTL.js
View File

@ -26,6 +26,16 @@ function udgEx(user, acct_id) {
} }
var at = localStorage.getItem("acct_" + acct_id + "_at") var at = localStorage.getItem("acct_" + acct_id + "_at")
var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + encodeURIComponent(user) var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + encodeURIComponent(user)
Swal.fire({
title: 'Loading...',
html: lang.lang_details_fetch,
showConfirmButton: false,
showCloseButton: true,
onBeforeOpen: () => {
Swal.showLoading()
},
onClose: () => { },
}).then((result) => { })
fetch(start, { fetch(start, {
method: "GET", method: "GET",
headers: { headers: {
@ -35,6 +45,7 @@ function udgEx(user, acct_id) {
}) })
.then(function (response) { .then(function (response) {
if (!response.ok) { if (!response.ok) {
Swal.close()
response.text().then(function (text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)
}) })
@ -49,14 +60,15 @@ function udgEx(user, acct_id) {
.then(function (json) { .then(function (json) {
if (json.accounts[0]) { if (json.accounts[0]) {
var id = json.accounts[0].id var id = json.accounts[0].id
udg(id, acct_id) udg(id, acct_id, true)
} else { } else {
Swal.close()
postMessage(["openUrl", user], "*") postMessage(["openUrl", user], "*")
} }
}) })
return true return true
} }
function udg(user, acct_id) { function udg(user, acct_id, isSwal) {
reset() reset()
if (!user) { if (!user) {
user = localStorage.getItem("user-id_" + acct_id) user = localStorage.getItem("user-id_" + acct_id)
@ -77,6 +89,7 @@ function udg(user, acct_id) {
} }
}) })
.then(function (response) { .then(function (response) {
if(isSwal) Swal.close()
if (!response.ok) { if (!response.ok) {
response.text().then(function (text) { response.text().then(function (text) {
setLog(response.url, response.status, text) setLog(response.url, response.status, text)

20
app/view/make/index.sample.html
View File

@ -458,7 +458,7 @@
<div class="collapsible-body toot-reset" id="toot-rt"></div> <div class="collapsible-body toot-reset" id="toot-rt"></div>
</li> </li>
</ul> </ul>
<div class="dm-hide"> <div class="dm-hide" style="max-width: 450px;">
@@useOtherAcct1@@(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>@@useOtherAcct2@@)<br /> @@useOtherAcct1@@(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>@@useOtherAcct2@@)<br />
<div class="row"> <div class="row">
<div class="col s6"> <div class="col s6">
@ -740,11 +740,13 @@
<div id="imagewrap"> <div id="imagewrap">
<img src="" id="imgmodal" /> <img src="" id="imgmodal" />
</div> </div>
<div class="progress nomargin hide transparent" id="imgmodal-progress">
<div class="indeterminate"></div>
</div>
<br /> <br />
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<div style="float: left;padding-top:0.23rem;line-height: normal;"> <div id="imginfo">
<span id="imgprog"></span>% <br /> <span id="imgprog"></span>% <br />
<span id="imgsec"></span>ms <br /><span id="imgbyte"></span>KB <span id="imgsec"></span>ms <br /><span id="imgbyte"></span>KB
</div> </div>
@ -794,11 +796,7 @@
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br /> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
<br /> <br />
<div id="release-22-2-0_Koume" class="release-do" style="display:none; "> <div id="release-22-2-0_Koume" class="release-do" style="display:none; ">
<br /> Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
<a href="https://ja.mstdn.
wiki/TheDesk" target="_blank">機能一覧</a><br />
Pixiv
FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note 22.2.0 (Koume)</h5> <h5>Release Note 22.2.0 (Koume)</h5>
<!--上のdivのidや1行上のところも変えてね--> <!--上のdivのidや1行上のところも変えてね-->
@ -1110,11 +1108,11 @@
</div> </div>
</div> </div>
<a onclick="about()" class="nex waves-effect pwa"> <a onclick="about()" class="nex waves-effect pwa">
<i class="material-icons" style="font-size: 1rem;">info</i>@@about@@ </a>&nbsp;|&nbsp; <i class="material-icons menu-icon">info</i>@@about@@ </a>&nbsp;|&nbsp;
<a onclick="bottomReverse()" class="nex waves-effect"> <a onclick="bottomReverse()" class="nex waves-effect">
<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>@@reverse@@ </a>&nbsp;|&nbsp; <i class="material-icons menu-icon">swap_horiz</i>@@reverse@@ </a>&nbsp;|&nbsp;
<a onclick="openRN()" class="nex waves-effect"> <a onclick="openRN()" class="nex waves-effect">
<i class="material-icons" style="font-size: 1rem;">new_releases</i>Release Note <i class="material-icons menu-icon">new_releases</i>Release Note
</a> </a>
</div> </div>
<div id="main"> <div id="main">

4
app/view/make/setting.sample.html
View File

@ -684,9 +684,9 @@
class="material-icons left">list</i>@@help@@/Docs</a> class="material-icons left">list</i>@@help@@/Docs</a>
<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" <a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
style="width:100%; max-width:40rem;"><i class="fab fa-github left"></i>GitHub</a> style="width:100%; max-width:40rem;"><i class="fab fa-github left"></i>GitHub</a>
<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2" <a href="index.html?mode=user&code=Cutls@1m.cutls.com" class="btn waves-effect blue lighten-2"
style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25" style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25"
style="padding-top:5px;">Main author: Cutls@cutls.com</a> style="padding-top:5px;">Main author: Cutls@1m.cutls.com</a>
<br> <br>
TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/@@gitHash@@">@@gitHash@@</a> - <a TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/@@gitHash@@">@@gitHash@@</a> - <a
onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';" onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';"

22
app/view/pl-PL/index.html
View File

@ -27,7 +27,7 @@
<body class=""> <body class="">
<script> <script>
var ver = '22.2.0 (Koume)' var ver = '22.2.0 (Koume)'
var gitHash = '5de0ede4e1a99358a9078c5f560f3b650fcf94b8' var gitHash = '8acf86d9cb88488a71de6a158f6bdab4b09ae2d9'
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//var ver="beta"; //var ver="beta";
var acct_id = 0 var acct_id = 0
@ -458,7 +458,7 @@
<div class="collapsible-body toot-reset" id="toot-rt"></div> <div class="collapsible-body toot-reset" id="toot-rt"></div>
</li> </li>
</ul> </ul>
<div class="dm-hide"> <div class="dm-hide" style="max-width: 450px;">
Use other account(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>:unfav and unBT are disabled.)<br /> Use other account(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>:unfav and unBT are disabled.)<br />
<div class="row"> <div class="row">
<div class="col s6"> <div class="col s6">
@ -740,11 +740,13 @@
<div id="imagewrap"> <div id="imagewrap">
<img src="" id="imgmodal" /> <img src="" id="imgmodal" />
</div> </div>
<div class="progress nomargin hide transparent" id="imgmodal-progress">
<div class="indeterminate"></div>
</div>
<br /> <br />
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<div style="float: left;padding-top:0.23rem;line-height: normal;"> <div id="imginfo">
<span id="imgprog"></span>% <br /> <span id="imgprog"></span>% <br />
<span id="imgsec"></span>ms <br /><span id="imgbyte"></span>KB <span id="imgsec"></span>ms <br /><span id="imgbyte"></span>KB
</div> </div>
@ -794,11 +796,7 @@
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br /> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
<br /> <br />
<div id="release-22-2-0_Koume" class="release-do" style="display:none; "> <div id="release-22-2-0_Koume" class="release-do" style="display:none; ">
<br /> Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
<a href="https://ja.mstdn.
wiki/TheDesk" target="_blank">機能一覧</a><br />
Pixiv
FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note 22.2.0 (Koume)</h5> <h5>Release Note 22.2.0 (Koume)</h5>
<!--上のdivのidや1行上のところも変えてね--> <!--上のdivのidや1行上のところも変えてね-->
@ -1110,11 +1108,11 @@
</div> </div>
</div> </div>
<a onclick="about()" class="nex waves-effect pwa"> <a onclick="about()" class="nex waves-effect pwa">
<i class="material-icons" style="font-size: 1rem;">info</i>About TheDesk </a>&nbsp;|&nbsp; <i class="material-icons menu-icon">info</i>About TheDesk </a>&nbsp;|&nbsp;
<a onclick="bottomReverse()" class="nex waves-effect"> <a onclick="bottomReverse()" class="nex waves-effect">
<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>Toot button layout reverse </a>&nbsp;|&nbsp; <i class="material-icons menu-icon">swap_horiz</i>Toot button layout reverse </a>&nbsp;|&nbsp;
<a onclick="openRN()" class="nex waves-effect"> <a onclick="openRN()" class="nex waves-effect">
<i class="material-icons" style="font-size: 1rem;">new_releases</i>Release Note <i class="material-icons menu-icon">new_releases</i>Release Note
</a> </a>
</div> </div>
<div id="main"> <div id="main">

8
app/view/pl-PL/setting.html
View File

@ -684,11 +684,11 @@
class="material-icons left">list</i>Help/Docs</a> class="material-icons left">list</i>Help/Docs</a>
<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" <a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
style="width:100%; max-width:40rem;"><i class="fab fa-github left"></i>GitHub</a> style="width:100%; max-width:40rem;"><i class="fab fa-github left"></i>GitHub</a>
<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2" <a href="index.html?mode=user&code=Cutls@1m.cutls.com" class="btn waves-effect blue lighten-2"
style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25" style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25"
style="padding-top:5px;">Main author: Cutls@cutls.com</a> style="padding-top:5px;">Main author: Cutls@1m.cutls.com</a>
<br> <br>
TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/5de0ede4e1a99358a9078c5f560f3b650fcf94b8">5de0ede4e1a99358a9078c5f560f3b650fcf94b8</a> - <a TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/8acf86d9cb88488a71de6a158f6bdab4b09ae2d9">8acf86d9cb88488a71de6a158f6bdab4b09ae2d9</a> - <a
onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';" onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';"
class="pointer pwa">Sprawdź aktualizacje</a><br> class="pointer pwa">Sprawdź aktualizacje</a><br>
<br> <br>
@ -698,7 +698,7 @@
<img src="https://status.cutls.com/badge-service?site=thedesk.top"> <img src="https://status.cutls.com/badge-service?site=thedesk.top">
</a><br> </a><br>
<h5>OSS License</h5> <h5>OSS License</h5>
<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/5de0ede4e1a99358a9078c5f560f3b650fcf94b8" <a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/8acf86d9cb88488a71de6a158f6bdab4b09ae2d9"
alt="FOSSA Status"><img alt="FOSSA Status"><img
src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a> src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a>
<br> <br>