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 class="cp">
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
href="https://pl.kpherox.dev/kPherox"
target="_blank"

67
app/css/master.css
View File

@ -28,7 +28,9 @@ html {
text-transform: none;
height: 2.76rem;
line-height: 2.76rem;
border-radius: 0.5rem;
}
.markdown {
display: none;
}
@ -88,7 +90,7 @@ option {
#imagewrap {
width: 100%;
height: 100%;
height: calc(100% - 4px);
}
#imagewrap img.rotate-90 {
transform: rotate(-90deg);
@ -234,6 +236,12 @@ blockquote:before,
right: 0;
top: 0;
}
.menu-icon {
font-size: 1.4rem !important;
top: 0.3rem;
line-height: 1rem !important;
position: relative;
}
#start {
display: none;
position: fixed;
@ -329,8 +337,26 @@ blockquote:before,
.collapsible-header:focus {
background-color: var(--thirdColor) !important;
}
.modal-footer {
.modal .modal-footer {
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-size: 1.5rem;
@ -342,7 +368,8 @@ blockquote:before,
.release-do {
border: solid 2px;
border-color: var(--text);
padding: 5px;
padding: 1.5rem;
border-radius: 0.5rem;
}
#pickers {
display: flex;
@ -392,7 +419,8 @@ input[type='color']::-webkit-color-swatch {
color: var(--text);
}
#left-menu a:hover {
background-color: var(--beforehover);
background-color: var(--emphasized);
filter: brightness(80%);
}
#left-menu span {
margin-left: 0.4rem;
@ -401,7 +429,9 @@ input[type='color']::-webkit-color-swatch {
background-color: var(--emphasized);
}
#left-menu a.active span {
text-decoration: underline;
text-decoration: none;
border-bottom: 1px solid;
padding-bottom: 0.5px;
}
#right-menu {
width: 100%;
@ -419,7 +449,7 @@ input[type='color']::-webkit-color-swatch {
align-items: center;
min-width: 150px;
width: 50%;
height: 2.5rem;
height: 2.5rem;
cursor: pointer;
color: var(--text);
}
@ -430,13 +460,14 @@ input[type='color']::-webkit-color-swatch {
}
#tltype .type span {
width: calc(100% - 4rem);
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-word;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-word;
overflow: hidden;
}
#tltype .type:hover {
background-color: var(--beforehover);
background-color: var(--emphasized);
filter: brightness(80%);
}
#tltype .active {
background-color: var(--emphasized);
@ -722,10 +753,10 @@ button {
}
#fonts {
overflow-y: scroll;
width: 22rem;
height: 40rem;
position: absolute;
background-color: var(--bg);
z-index: 2;
padding: 5px;
}
width: 22rem;
height: 40rem;
position: absolute;
background-color: var(--bg);
z-index: 2;
padding: 5px;
}

49
app/css/tl.css
View File

@ -360,7 +360,7 @@ iframe,
}
.area-actions .btn-flat {
height: 1.3rem;
line-height: 1.3rem;
line-height: 1.3rem;
}
.area-actions .btn-flat,
.area-vis i,
@ -386,11 +386,13 @@ iframe,
}
.notf-udg-text {
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-word;
overflow: hidden;
max-width: calc(100% - 150px);
display: inline-block;
text-overflow: ellipsis;
word-break: break-word;
overflow: hidden;
max-width: calc(100% - 150px);
display: inline-block;
position: relative;
top: 0.2rem;
}
.cusr {
user-select: text;
@ -416,6 +418,12 @@ iframe,
margin-top: 0.46rem;
margin-left: 0.46rem;
}
.landing {
text-align: center;
display: flex;
flex-direction: column;
align-items: center;
}
.quote-inline {
display: none;
@ -449,6 +457,12 @@ iframe,
.btn-flat {
color: var(--text);
}
.sublink {
font-size: 1.4rem !important;
position: relative;
top: 0.4rem;
cursor: pointer;
}
.area-side i {
margin-left: 0.75rem;
}
@ -459,6 +473,9 @@ iframe,
font-size: 1.2rem;
margin-right: 0.15rem;
}
.action li i {
margin-right: 0.5rem;
}
.action .fa-quote-right {
margin-top: 0.15rem;
}
@ -710,15 +727,15 @@ p:not(:last-child) {
}
.notf-indv-box .setting {
font-size: 1rem;
width: calc(25% - 6px);
margin: 3px;
height: 100px;
text-align: center;
display: flex;
flex-direction: column;
padding-top: 17px;
border: 1px solid;
border-radius: 5px;
width: calc(25% - 6px);
margin: 3px;
height: 100px;
text-align: center;
display: flex;
flex-direction: column;
padding-top: 17px;
border: 1px solid;
border-radius: 5px;
}
.notf-indv-box .setting:hover {
color: var(--text);
@ -761,7 +778,7 @@ p:not(:last-child) {
position: relative;
}
.dropdown-content li {
padding-top: 0.4rem;
padding-top: 0.4rem;
}
.fa-2x > .emoji-img {
width: 2.3rem !important;

26
app/css/userdata.css
View File

@ -24,21 +24,20 @@
}
#his-float-data {
height: 100%;
overflow-y: hidden;
overflow-y: hidden;
}
#his-leftside {
width: 28.4rem;
max-width: 30vw;
width: 28.4rem;
max-width: 30vw;
}
#his-float-timeline {
max-width: 47.5rem;
min-width: calc(100% - 29.4rem);
max-width: 47.5rem;
width: calc(100% - 28.4rem);
height: 100%;
overflow-y: hidden;
}
#his-basic-prof {
display: flex;
display: flex;
min-height: 10rem;
}
#his-field {
@ -150,7 +149,7 @@
background-color: var(--bg);
}
#hisdropdown li a {
color: white;
color: var(--text);
}
#hisdropdown li:hover {
background-color: var(--active);
@ -160,11 +159,14 @@
text-align: center;
font-size: 1.5rem;
display: flex;
justify-content: center;
align-items: center;
justify-content: center;
align-items: center;
}
#his-data-title .material-icons {
position: relative;
top: 7px;
margin-right: 3px;
top: 5px;
margin-right: 3px;
}
#his-data-title a {
color: white;
}

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

@ -5,20 +5,6 @@ function verck(ver, jp) {
$('body').addClass(localStorage.getItem('platform'))
var date = new Date()
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')) {
showVer = true
console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
@ -44,10 +30,7 @@ function verck(ver, jp) {
localStorage.setItem('ver', ver)
if (!showVer) {
console.log(showVer)
if (
date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
!localStorage.getItem('showSupportMe')
) {
if (!localStorage.getItem('showSupportMe')) {
if (date.getMonth() == 11) {
var yrs = date.getFullYear() + 1
var nextmonth = yrs * 100 + 1
@ -55,21 +38,35 @@ function verck(ver, jp) {
var yrs = date.getFullYear()
var nextmonth = yrs * 100 + date.getMonth() + 2
}
if (lang.language != 'ja') {
$('#support-btm-ja').addClass('hide')
$('#support-btm-en').removeClass('hide')
}
localStorage.setItem('showSupportMe', nextmonth)
$('#support-btm').removeClass('hide')
$('#support-btm').animate(
{
bottom: '0'
},
{
duration: 300
} else {
if (
date.getFullYear() * 100 + date.getMonth() + 1 >= 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)
if (lang.language != 'ja') {
$('#support-btm-ja').addClass('hide')
$('#support-btm-en').removeClass('hide')
}
$('#support-btm').removeClass('hide')
$('#support-btm').animate(
{
bottom: '0'
},
{
duration: 300
}
)
}
}
}
var platform = localStorage.getItem('platform')
console.log('Your platform:' + platform)
@ -114,11 +111,6 @@ function verck(ver, jp) {
.then(function(mess) {
console.table(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')
if (platform == 'darwin') {
var newest = mess.desk_mac

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

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

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

@ -38,9 +38,10 @@ function directory(isMore) {
}
if (isMore) {
var addOffset = $("#dir-contents .cvo").length
$("#dir-contents").append(`<div class="progress transparent"><div class="indeterminate"></div></div>`)
} else {
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
console.log(start)
@ -51,19 +52,20 @@ function directory(isMore) {
Authorization: "Bearer " + at
}
})
.then(function(response) {
.then(function (response) {
$("#dir-contents .progress").remove()
if (!response.ok) {
response.text().then(function(text) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
.catch(function (error) {
setLog(start, "JSON", error)
console.error(error)
})
.then(function(json) {
.then(function (json) {
if (json) {
$("#moreDir").removeClass("disabled")
var html = userparse(json, null, acct_id, "dir", null)

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

@ -44,6 +44,7 @@ function notfColumn(acct_id, tlid, sys) {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
$('#landing_' + tlid).append(`<div>${this.status}</div><div>${escapeHTML(this.response)}`)
setLog(start, this.status, this.response)
}
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>'
$('#timeline_' + tlid).html(templete)
$('#landing_' + tlid).hide()
// $('#landing_' + tlid).hide()
jQuery('time.timeago').timeago()
}
$('#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'))
if (!response.ok) {
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)
})
}
@ -202,7 +205,7 @@ function notfCommon(acct_id, tlid, sys, stream) {
}
})
$('div[data-notf=' + acct_id + ']').html(templete)
$('#landing_' + tlid).hide()
// $('#landing_' + tlid).hide()
jQuery('time.timeago').timeago()
}
$('#notf-box').addClass('fetched')
@ -232,6 +235,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
$('i[data-notf=' + acct_id + ']').removeClass('red-text')
}
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)]);
var popup = localStorage.getItem('popup')
if (!popup) {
@ -356,7 +360,7 @@ function notfmore(tlid) {
moreloading = false
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
$('#timeline_' + tlid).append(templete)
$('#landing_' + tlid).hide()
// $('#landing_' + tlid).hide()
jQuery('time.timeago').timeago()
}
$('#notf-box').addClass('fetched')

5
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]
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') {
viewer =
viewer +
@ -1317,7 +1317,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
class="sml gray"
style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"
>
@ ${toot.acct}${locked}</span>
@${toot.acct}${locked}</span>
</div>
</div>
<div class="area-status">
@ -1552,6 +1552,7 @@ function mastodonBaseStreaming(acct_id) {
$('.notice_icon_acct_' + acct_id).removeClass('red-text')
}
mastodonBaseWs[domain].onmessage = function (mess) {
$(`div[data-acct=${acct_id}] .landing`).hide()
const typeA = JSON.parse(mess.data).event
if (typeA == 'delete') {
$(`[unique-id=${JSON.parse(mess.data).payload}]`).hide()

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

@ -13,7 +13,21 @@ function searchMenu() {
//検索取得
function src(mode, 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 = ''
} else {
var add = '&type=accounts&offset=' + $('#src-accts .cvo').length
@ -48,24 +62,27 @@ function src(mode, offset) {
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
.then(function (response) {
if (!offset) {
$('#src-contents').html(``)
}
if (!response.ok) {
response.text().then(function(text) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
.catch(function (error) {
src('v1')
return false
})
.then(function(json) {
.then(function (json) {
console.log(['Search', json])
//ハッシュタグ
if (json.hashtags[0]) {
var tags = ''
Object.keys(json.hashtags).forEach(function(key4) {
Object.keys(json.hashtags).forEach(function (key4) {
var tag = json.hashtags[key4]
if (mode) {
tags =
@ -116,7 +133,7 @@ function tsAdd(q) {
parseColumn('add')
}
function tootsearch(tlid, q) {
if(!q || q=='undefined') {
if (!q || q == 'undefined') {
return false
}
var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
@ -129,20 +146,20 @@ function tootsearch(tlid, q) {
'content-type': 'application/json'
}
})
.then(function(response) {
.then(function (response) {
if (!response.ok) {
response.text().then(function(text) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
.catch(function (error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(raw) {
.then(function (raw) {
var templete = ''
var json = raw.hits.hits
var max_id = raw['hits'].length
@ -180,20 +197,20 @@ function moreTs(tlid, q) {
'content-type': 'application/json'
}
})
.then(function(response) {
.then(function (response) {
if (!response.ok) {
response.text().then(function(text) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
.catch(function (error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(raw) {
.then(function (raw) {
var templete = ''
var json = raw.hits.hits
var max_id = raw['hits'].length
@ -256,8 +273,8 @@ function graphDrawCore(his, tag, acct_id) {
</div>
<div class="tagCompTag">
<a onclick="tl('tag','${escapeHTML(
tag.name
)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
tag.name
)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
#${escapeHTML(tag.name)}
</a>
</div>
@ -290,21 +307,21 @@ function trend() {
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
.then(function (response) {
if (!response.ok) {
response.text().then(function(text) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
.catch(function (error) {
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
.then(function (json) {
var tags = ''
Object.keys(json).forEach(function(keye) {
Object.keys(json).forEach(function (keye) {
var tag = json[keye]
var his = tag.history
tags = graphDrawCore(his, tag, acct_id)
@ -327,18 +344,18 @@ function doSrc(type) {
$('#pageSrc').addClass('hide')
$('#pageSrc').removeClass('keep')
var q = $('.srcQ').text()
if(type == 'web') {
if (type == 'web') {
var start = localStorage.getItem('srcUrl')
if(!start) {
if (!start) {
start = 'https://google.com/search?q={q}'
}
start = start.replace(/{q}/, q)
postMessage(["openUrl", start], "*")
} else if(type == 'ts') {
} else if (type == 'ts') {
tsAdd(q)
} else if(type == 'copy') {
} else if (type == 'copy') {
execCopy(q)
} else if(type == 'toot') {
} else if (type == 'toot') {
brInsert(q)
}
}

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

@ -10,6 +10,7 @@ if (location.search) {
}
//よく使うタグ
function tagShow(tag, elm) {
tag = decodeURIComponent(tag)
const tagTL = lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)
const tagPin = lang.lang_parse_tagpin.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) {
if (!response.ok) {
response.text().then(function (text) {
$('#landing_' + tlid).append(`<div>${response.status}</div><div>${escapeHTML(text)}`)
setLog(response.url, response.status, text)
})
}
@ -193,6 +194,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
console.error(error)
})
.then(function (json) {
if(!json) return true
console.log(['Result of getting timeline of ' + tlid, json])
$('#landing_' + tlid).hide()
var mute = getFilterTypeByAcct(acct_id, type)

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

@ -21,7 +21,7 @@ function imgv(id, key, acct_id) {
if (remote_img == 'yes') {
murl = ourl
}
$(document).ready(function() {
$(document).ready(function () {
if (type == 'image') {
$('#imagemodal').modal('open')
imageXhr(id, key, murl)
@ -62,7 +62,7 @@ function imgCont(type) {
$('#imgsec').text(0)
$('#imgmodal').attr('src', '../../img/loading.svg')
var type = $('#' + id + '-image-' + key).attr('data-type')
$(document).ready(function() {
$(document).ready(function () {
if (type == 'image') {
imageXhr(id, key, murl)
$('#imagewrap').dragScroll() // ドラッグスクロール設定
@ -77,16 +77,22 @@ function imgCont(type) {
}
function imageXhr(id, key, murl) {
var startTime = new Date()
$('#imgmodal-progress div').removeClass('determinate')
$('#imgmodal-progress div').addClass('indeterminate')
$('#imgmodal-progress').removeClass('hide')
xhr = new XMLHttpRequest()
xhr.open('GET', murl, true)
xhr.responseType = 'arraybuffer'
xhr.addEventListener(
'progress',
function(event) {
function (event) {
if (event.lengthComputable) {
var total = event.total
var now = event.loaded
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))
}
},
@ -94,31 +100,35 @@ function imageXhr(id, key, murl) {
)
xhr.addEventListener(
'loadend',
function(event) {
function (event) {
var total = event.total
$('#imgbyte').text(Math.floor(total / 1024))
var now = event.loaded
var per = (now / total) * 100
$('#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
)
xhr.addEventListener(
'error',
function(event) {
function (event) {
$('#imgmodal').attr('src', murl)
},
false
)
xhr.onreadystatechange = function() {
xhr.onreadystatechange = function () {
if (this.readyState == 4 && this.status == 200) {
r = new FileReader()
r.readAsDataURL(this.response)
r.onload = function() {
r.onload = function () {
var b64 = r.result
var element = new Image()
var width
element.onload = function() {
element.onload = function () {
var width = element.naturalWidth
var height = element.naturalHeight
calcNiceAspect(width, height)
@ -146,8 +156,8 @@ function imageXhr(id, key, murl) {
xhr.responseType = 'blob'
xhr.send()
}
function calcNiceAspect( width, height ) {
if(width < 650) {
function calcNiceAspect(width, height) {
if (width < 650) {
width = 650
}
var windowH = $(window).height()
@ -156,7 +166,7 @@ function calcNiceAspect( width, height ) {
$('#imagemodal img').css('width', 'auto')
if (height < windowH) {
$('#imagemodal').css('height', height + 100 + 'px')
$('#imagemodal img').css('height', height + 'px')
$('#imagemodal img').css('height', height + 'px')
if (width > windowW * 0.8) {
$('#imagemodal').css('width', '80vw')
$('#imagemodal img').css('width', 'auto')
@ -188,11 +198,11 @@ function zoom(z) {
$('#imagewrap img').css('height', hgt + 'px')
}
//スマホ対応ドラッグ移動システム
(function() {
$.fn.dragScroll = function() {
(function () {
$.fn.dragScroll = function () {
var target = this
$(this)
.mousedown(function(event) {
.mousedown(function (event) {
$(this)
.data('down', true)
.data('x', event.clientX)
@ -207,7 +217,7 @@ function zoom(z) {
})
// ウィンドウから外れてもイベント実行
$(document)
.mousemove(function(event) {
.mousemove(function (event) {
if ($(target).data('down') == true) {
// スクロール
target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - event.clientX)
@ -215,11 +225,11 @@ function zoom(z) {
return false // 文字列選択を抑止
}
})
.mouseup(function(event) {
.mouseup(function (event) {
$(target).data('down', false)
})
$(this)
.on('touchstart', function(event) {
.on('touchstart', function (event) {
$(this)
.data('down', true)
.data('x', getX(event))
@ -232,7 +242,7 @@ function zoom(z) {
overflow: 'hidden', // スクロールバー非表示
cursor: 'move'
}) //指が触れたか検知
$(this).on('touchmove', function(event) {
$(this).on('touchmove', function (event) {
if ($(target).data('down') === true) {
// スクロール
target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - getX(event))
@ -241,7 +251,7 @@ function zoom(z) {
} else {
}
}) //指が動いたか検知
$(this).on('touchend', function(event) {
$(this).on('touchend', function (event) {
$(target).data('down', false)
})
@ -258,7 +268,7 @@ function getY(event) {
}
//マウスホイールで拡大
var element = document.getElementById('imagemodal')
element.onmousewheel = function(e) {
element.onmousewheel = function (e) {
var delta = e.wheelDelta
if (delta > 0) {
zoom(1.1)

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

@ -281,7 +281,7 @@ function parseColumn(target, dontclose) {
excludeNotf = excludeNotf + '</div>'
notfDomain = 'dummy'
notfKey = 'dummy'
var excludeHome =''
var excludeHome = ''
} else if (acct.type == 'home') {
var excludeNotf = ''
var excludeHome = `<a onclick="ebtToggle('${key}')" class="setting nex waves-effect">
@ -452,8 +452,20 @@ function parseColumn(target, dontclose) {
<div class="tl-box" 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}">
<div id="landing_${key}" style="text-align:center">
${lang.lang_layout_nodata}
<div id="landing_${key}" class="landing">
<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>`

21
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 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, {
method: "GET",
headers: {
@ -35,6 +45,7 @@ function udgEx(user, acct_id) {
})
.then(function (response) {
if (!response.ok) {
Swal.close()
response.text().then(function (text) {
setLog(response.url, response.status, text)
})
@ -49,14 +60,15 @@ function udgEx(user, acct_id) {
.then(function (json) {
if (json.accounts[0]) {
var id = json.accounts[0].id
udg(id, acct_id)
udg(id, acct_id, true)
} else {
Swal.close()
postMessage(["openUrl", user], "*")
}
})
return true
}
function udg(user, acct_id) {
function udg(user, acct_id, isSwal) {
reset()
if (!user) {
user = localStorage.getItem("user-id_" + acct_id)
@ -77,6 +89,7 @@ function udg(user, acct_id) {
}
})
.then(function (response) {
if(isSwal) Swal.close()
if (!response.ok) {
response.text().then(function (text) {
setLog(response.url, response.status, text)
@ -151,7 +164,7 @@ function udg(user, acct_id) {
const title = $('.column-first').html()
$("#my-data-nav .anc-link").removeClass("active-back")
$('.column-first').addClass("active-back")
$('#his-data-title').html(title)
$('#his-data-title').html(title)
$("#his-data").css("background-image", "url(" + json.header + ")")
$("#his-sta").text(json.statuses_count)
$("#his-follow").text(json.following_count)
@ -564,7 +577,7 @@ $("#my-data-nav .anc-link").on("click", function () {
let title = $(this).html()
if (target === '#his-tl') $("#util-add").removeClass("hide")
if (target != '#his-tl') $("#util-add").addClass("hide")
$('#his-data-title').html(title)
$('#his-data-title').html(title)
$("#my-data-nav .anc-link").removeClass("active-back")
$(this).addClass("active-back")
$(target).show()

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

@ -458,7 +458,7 @@
<div class="collapsible-body toot-reset" id="toot-rt"></div>
</li>
</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 />
<div class="row">
<div class="col s6">
@ -740,11 +740,13 @@
<div id="imagewrap">
<img src="" id="imgmodal" />
</div>
<div class="progress nomargin hide transparent" id="imgmodal-progress">
<div class="indeterminate"></div>
</div>
<br />
</div>
<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="imgsec"></span>ms <br /><span id="imgbyte"></span>KB
</div>
@ -794,11 +796,7 @@
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
<br />
<div id="release-22-2-0_Koume" class="release-do" style="display:none; ">
<br />
<a href="https://ja.mstdn.
wiki/TheDesk" target="_blank">機能一覧</a><br />
Pixiv
FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note 22.2.0 (Koume)</h5>
<!--上のdivのidや1行上のところも変えてね-->
@ -1110,11 +1108,11 @@
</div>
</div>
<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">
<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">
<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>
</div>
<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>
<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>
<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="padding-top:5px;">Main author: Cutls@cutls.com</a>
style="padding-top:5px;">Main author: Cutls@1m.cutls.com</a>
<br>
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';"

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

@ -27,7 +27,7 @@
<body class="">
<script>
var ver = '22.2.0 (Koume)'
var gitHash = '5de0ede4e1a99358a9078c5f560f3b650fcf94b8'
var gitHash = '8acf86d9cb88488a71de6a158f6bdab4b09ae2d9'
//betaを入れるとバージョンチェックしない
//var ver="beta";
var acct_id = 0
@ -458,7 +458,7 @@
<div class="collapsible-body toot-reset" id="toot-rt"></div>
</li>
</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 />
<div class="row">
<div class="col s6">
@ -740,11 +740,13 @@
<div id="imagewrap">
<img src="" id="imgmodal" />
</div>
<div class="progress nomargin hide transparent" id="imgmodal-progress">
<div class="indeterminate"></div>
</div>
<br />
</div>
<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="imgsec"></span>ms <br /><span id="imgbyte"></span>KB
</div>
@ -794,11 +796,7 @@
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
<br />
<div id="release-22-2-0_Koume" class="release-do" style="display:none; ">
<br />
<a href="https://ja.mstdn.
wiki/TheDesk" target="_blank">機能一覧</a><br />
Pixiv
FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note 22.2.0 (Koume)</h5>
<!--上のdivのidや1行上のところも変えてね-->
@ -1110,11 +1108,11 @@
</div>
</div>
<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">
<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">
<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>
</div>
<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>
<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>
<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="padding-top:5px;">Main author: Cutls@cutls.com</a>
style="padding-top:5px;">Main author: Cutls@1m.cutls.com</a>
<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';"
class="pointer pwa">Sprawdź aktualizacje</a><br>
<br>
@ -698,7 +698,7 @@
<img src="https://status.cutls.com/badge-service?site=thedesk.top">
</a><br>
<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
src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a>
<br>