Compare commits

..

16 Commits

Author SHA1 Message Date
cutls
b7c82b4831 add 2019-12-14 23:54:34 +09:00
cutls
626aebef4d TheDesk 20.1.0 (Kawaii) 2019-12-14 23:41:35 +09:00
cutls
32420fecd9 Fix: Poll emoji when refreshed, static emoji #193 2019-12-14 10:29:59 +09:00
cutls
c318803ecd Fix cannot del&red img #185 2019-12-14 10:12:18 +09:00
cutls
adf37f6513 Add: auto resize, auto stamp 2019-12-14 01:54:40 +09:00
cutls
0dcc0ff0ac Fix: import and export 2019-12-14 00:48:34 +09:00
cutls
f30749d752 Fix: unvisible leading choice when shared polls 2019-12-13 02:07:33 +09:00
cutls
af459aa93a Fix: openFinder dialog 2019-12-12 00:17:22 +09:00
cutls
e190cf3393 Merge branch 'master' of github.com:cutls/TheDesk 2019-12-12 00:06:51 +09:00
cutls
9f6c14ced0 WIP: to null-safety app 2019-12-12 00:06:40 +09:00
cutls
320576f288 For Pleroma move type notif 2019-12-12 00:06:12 +09:00
cutls
7366d9ce98 Cannot unfav/unBT 2019-12-12 00:05:40 +09:00
dependabot-preview[bot]
6da37a6cbb Bump sweetalert2 from 9.4.0 to 9.5.3 in /app (#198)
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.4.0 to 9.5.3.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.4.0...v9.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 09:43:59 +09:00
cutls
140e47d842 Add unknown notf type of Pleroma, 'move' 2019-12-10 23:24:16 +09:00
cutls
44128d8801 delete and redraft 2019-12-08 14:50:56 +09:00
cutls
046dbc5559 Cannot img <- / -> 2019-12-08 00:51:49 +09:00
28 changed files with 882 additions and 565 deletions

View File

@@ -224,7 +224,10 @@ iframe,
margin: -1px 0;
}
.bigemoji {
width: 60px !important;
width: 100px !important;
height: auto !important;
position: relative;
z-index: 9999;
}
.faicon_FTL {
display: none;
@@ -705,7 +708,8 @@ p:not(:last-child) {
position: relative;
}
.maxVoter {
background-color: var(--shared);
background-color: var(--emphasized);
filter: brightness(120%);
}
.ownMark img {
width: 1.2rem !important;

View File

@@ -138,13 +138,13 @@ onmessage = function(e) {
} else if (e.data[0] == 'udg') {
udg(e.data[1][0], e.data[1][1])
} else if (e.data[0] == 'media') {
media(e.data[1][0], e.data[1][1], e.data[1][2])
media(e.data[1][0], e.data[1][1], e.data[1][2], e.data[1][3])
} else if (e.data[0] == 'post') {
post('pass')
} else if (e.data[0] == 'toastSaved') {
var show = `${lang.lang_img_DLDone}${
e.data[1][0]
}<button class="btn-flat toast-action" onclick="openFinder(${e.data[1][1]}')">Show</button>`
}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
M.toast({ html: show, displayLength: 5000 })
} else if (e.data[0] == 'parseColumn') {
parseColumn(e.data[1])

View File

@@ -211,8 +211,23 @@ function escapeCsv(str) {
}
return result
}
function evalAttr(json, attr, lenCk) {
if (json[attr]) {
if (lenCk) {
if (json[attr][0]) {
return true
} else {
return false
}
} else {
return true
}
} else {
return false
}
}
function statusModel(now) {
if(!now){
if (!now) {
var now = new Date().toString()
}
return {
@@ -248,12 +263,10 @@ function statusModel(now) {
locked: false,
bot: false,
created_at: now,
note:
'',
note: '',
url: '',
avatar: '',
avatar_static:
'',
avatar_static: '',
header: '',
header_static: '',
followers_count: 0,

View File

@@ -13,6 +13,10 @@ onmessage = function(e) {
ipc.send('dialogStore', e.data[1])
} else if (e.data[0] == 'bmpImage') {
ipc.send('bmp-image', e.data[1])
} else if (e.data[0] == 'resizeImage') {
ipc.send('resize-image', e.data[1])
} else if (e.data[0] == 'stampImage') {
ipc.send('stamp-image', e.data[1])
} else if (e.data[0] == 'dialogCW') {
ipc.send('dialogCW', e.data[1])
} else if (e.data[0] == 'nativeNotf') {
@@ -112,7 +116,31 @@ ipc.on('theme-css-response', function(event, arg) {
})
//img.js
ipc.on('bmp-img-comp', function(event, b64) {
postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
if (b64[2]) {
var stamped = true
} else {
var stamped = false
}
postMessage(['media', [b64[0], 'image/png', b64[1], stamped]], '*')
})
ipc.on('resizeJudgement', function(event, b64) {
var resize = localStorage.getItem('uploadCrop') * 1
if (resize > 0) {
var element = new Image()
var width
element.onload = function() {
var width = element.naturalWidth
var height = element.naturalHeight
if (width > resize || height > resize) {
ipc.send('resize-image', [b64, resize])
} else {
postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
}
}
element.src = b64
} else {
postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
}
})
//ui,img.js
ipc.on('general-dl-prog', function(event, arg) {

View File

@@ -60,6 +60,24 @@ function handleFileUpload(files, obj, no) {
var fr = new FileReader()
fr.onload = function(evt) {
var b64 = evt.target.result
var resize = localStorage.getItem('uploadCrop') * 1
if (resize > 0) {
var element = new Image()
var width
element.onload = function() {
var width = element.naturalWidth
var height = element.naturalHeight
if (width > resize || height > resize) {
postMessage(['resizeImage', [b64, resize]], '*')
return false
} else {
$('#b64-box').val(b64)
var ret = media(b64, files['type'], no)
}
}
element.src = b64
return false
}
$('#b64-box').val(b64)
var ret = media(b64, files['type'], no)
}
@@ -68,7 +86,15 @@ function handleFileUpload(files, obj, no) {
}
//ファイルアップロード
function media(b64, type, no) {
function media(b64, type, no, stamped) {
var acct_id = $('#post-acct-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
var user = localStorage.getItem('user_' + acct_id)
if ($('#stamp').hasClass('stamp-avail') && !stamped) {
postMessage(['stampImage', [b64, user + '@' + domain]], '*')
return false
}
console.log(b64)
var l = 4
var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
var cl = c.length
@@ -88,8 +114,6 @@ function media(b64, type, no) {
var media = toBlob(b64, type)
var fd = new FormData()
fd.append('file', media)
var acct_id = $('#post-acct-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var httpreq = new XMLHttpRequest()
if (localStorage.getItem('mode_' + domain) == 'misskey') {
@@ -104,7 +128,6 @@ function media(b64, type, no) {
}
var previewer = 'url'
fd.append('i', at)
//fd.append('isSensitive', nsfw);
httpreq.send(fd)
} else {
var previewer = 'preview_url'
@@ -133,11 +156,7 @@ function media(b64, type, no) {
}
var img = localStorage.getItem('img')
if (json.type.indexOf('image') != -1) {
var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${
json['id']
}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${
json['id']
}')" title="${lang.lang_postimg_delete}">`
var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${json['id']}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${json['id']}')" title="${lang.lang_postimg_delete}">`
$('#preview').append(html)
} else {
$('#preview').append(lang.lang_postimg_previewdis)
@@ -151,7 +170,7 @@ function media(b64, type, no) {
mediav = mediav.replace(regExp, json['id'])
$('#media').val(mediav)
}
if (img == 'url') {
if (img == 'url' && json['text_url']) {
$('#textarea').val($('#textarea').val() + ' ' + json['text_url'])
}
todc()
@@ -300,3 +319,12 @@ function altImage(acct_id, id) {
}
})
}
function stamp() {
if ($('#stamp').hasClass('stamp-avail')) {
$('#stamp').html('Off')
$('#stamp').removeClass('stamp-avail')
} else {
$('#stamp').html('On')
$('#stamp').addClass('stamp-avail')
}
}

View File

@@ -295,6 +295,8 @@ function clear() {
$('#nsfw').removeClass('yellow-text')
$('#nsfw').html('visibility_off')
$('#nsfw').removeClass('nsfw-avail')
$('#stamp').html('Off')
$('#stamp').removeClass('stamp-avail')
$('#nsc').text(lang.lang_nothing)
$('#drag').css('background-color', '#e0e0e0')
$('#preview').html('')

View File

@@ -1,7 +1,7 @@
//お気に入り登録やブースト等、フォローやブロック等
//お気に入り登録
function fav(id, acct_id, remote) {
if ($('#pub_' + id).hasClass('faved')) {
if ($(`.cvo[unique-id=${id}]`).hasClass('faved')) {
var flag = 'unfavourite'
} else {
var flag = 'favourite'
@@ -57,7 +57,7 @@ function fav(id, acct_id, remote) {
//ブースト
function rt(id, acct_id, remote, vis) {
if ($('#pub_' + id).hasClass('rted')) {
if ($(`.cvo[toot-id=${id}]`).hasClass('rted')) {
var flag = 'unreblog'
} else {
var flag = 'reblog'
@@ -85,7 +85,7 @@ function rt(id, acct_id, remote, vis) {
json = json.reblog
}
console.log(['Success: boost', json])
$('[unique-id=' + id + '] .fav_ct').text(json.favourites_count)
$('[toot-id=' + id + '] .fav_ct').text(json.favourites_count)
if (!json.reblog) {
if (flag == 'unreblog') {
var rt = json.reblogs_count - 1
@@ -95,16 +95,16 @@ function rt(id, acct_id, remote, vis) {
} else {
var rt = json.reblogs_count
}
$('[unique-id=' + id + '] .rt_ct').text(rt)
$('[toot-id=' + id + '] .rt_ct').text(rt)
} else {
$('[unique-id=' + id + '] .rt_ct').text(json.reblogs_count)
$('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count)
}
if ($('[unique-id=' + id + ']').hasClass('rted')) {
$('[unique-id=' + id + ']').removeClass('rted')
if ($('[toot-id=' + id + ']').hasClass('rted')) {
$('[toot-id=' + id + ']').removeClass('rted')
$('.rt_' + id).removeClass('light-blue-text')
} else {
$('[unique-id=' + id + ']').addClass('rted')
$('[toot-id=' + id + ']').addClass('rted')
$('.rt_' + id).addClass('light-blue-text')
}
}
@@ -117,7 +117,7 @@ function boostWith(vis) {
}
//ブックマーク
function bkm(id, acct_id, tlid) {
if ($('#pub_' + id).hasClass('bkmed')) {
if ($(`.cvo[unique-id=${id}]`).hasClass('bkmed')) {
var flag = 'unbookmark'
} else {
var flag = 'bookmark'
@@ -420,20 +420,30 @@ function redraft(id, acct_id) {
$('select').formSelect()
mdCheck()
var medias = $('[toot-id=' + id + ']').attr('data-medias')
var mediack = json.media_attachments[0]
//メディアがあれば
var media_ids = []
if (mediack) {
for (var i = 0; i <= 4; i++) {
if (json.media_attachments[i]) {
media_ids.push(json.media_attachments[i].id)
$('#preview').append(
'<img src="' +
json.media_attachments[i].preview_url +
'" style="width:50px; max-height:100px;">'
)
} else {
break
}
}
}
var vismode = $('[toot-id=' + id + '] .vis-data').attr('data-vis')
vis(vismode)
var medias = media_ids.join(',');
$('#media').val(medias)
var ct = medias.split(',').length
$('[toot-id=' + id + '] img.toot-img').each(function(i, elem) {
if (i < ct) {
var url = $(elem).attr('src')
console.log('Play back image data:' + url)
$('#preview').append('<img src="' + url + '" style="width:50px; max-height:100px;">')
}
})
localStorage.setItem('nohide', true)
show()
if(json.text){
if (json.text) {
var html = json.text
} else {
var html = $('[toot-id=' + id + '] .toot').html()
@@ -449,12 +459,12 @@ function redraft(id, acct_id) {
cw()
$('#cw-text').val(json.spoiler_text)
}
if (json.sensitive){
if (json.sensitive) {
$('#nsfw').addClass('yellow-text')
$('#nsfw').html('visibility')
$('#nsfw').addClass('nsfw-avail')
}
if(json.in_reply_to_id){
if (json.in_reply_to_id) {
$('#reply').val(json.in_reply_to_id)
}
}
@@ -464,7 +474,7 @@ function redraft(id, acct_id) {
}
//ピン留め
function pin(id, acct_id) {
if ($('#pub_' + id).hasClass('pined')) {
if ($(`.cvo[unique-id=${id}]`).hasClass('pined')) {
var flag = 'unpin'
} else {
var flag = 'pin'
@@ -644,13 +654,17 @@ function staEx(mode) {
console.error(error)
})
.then(function(json) {
var id = json.statuses[0].id
if (mode == 'rt') {
rt(id, acct_id, 'remote')
} else if (mode == 'fav') {
fav(id, acct_id, 'remote')
} else if (mode == 'reply') {
reEx(id)
if (json.statuses) {
if (json.statuses[0]) {
var id = json.statuses[0].id
if (mode == 'rt') {
rt(id, acct_id, 'remote')
} else if (mode == 'fav') {
fav(id, acct_id, 'remote')
} else if (mode == 'reply') {
reEx(id)
}
}
}
})
return

View File

@@ -69,7 +69,8 @@ function notfColumn(acct_id, tlid, sys) {
var n = new Notification('TheDesk:' + domain, options)
}
var mute = getFilterTypeByAcct(acct_id, 'notif')
if (obj.type != 'follow') {
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
if (obj.type != 'follow' && obj.type != 'move') {
if (misskey) {
templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
} else {
@@ -79,7 +80,7 @@ function notfColumn(acct_id, tlid, sys) {
if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute)
} else {
templete = templete + userparse([obj.account], 'notf', acct_id, tlid, -1)
templete = templete + userparse([obj.account], obj.type, acct_id, tlid, -1)
}
}
})
@@ -179,7 +180,8 @@ function notfCommon(acct_id, tlid, sys) {
var n = new Notification('TheDesk:' + domain, options)
}
var mute = getFilterTypeByAcct(acct_id, 'notif')
if (obj.type != 'follow') {
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
if (obj.type != 'follow' && obj.type != 'move') {
if (misskey) {
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
} else {
@@ -189,7 +191,7 @@ function notfCommon(acct_id, tlid, sys) {
if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
} else {
templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1)
templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
}
}
})
@@ -238,7 +240,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
if (obj.type != 'follow') {
templete = parse([obj], 'notf', acct_id, 'notf', popup)
} else {
templete = userparse([obj], 'notf', acct_id, 'notf', popup)
templete = userparse([obj], obj.type, acct_id, 'notf', popup)
}
if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) {
$('div[data-notf=' + acct_id + ']').prepend(templete)
@@ -338,7 +340,7 @@ function notfmore(tlid) {
if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
} else {
templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1)
templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
}
}
})

View File

@@ -217,8 +217,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
Object.keys(toot.account.emojis).forEach(function(key5) {
var emoji = toot.account.emojis[key5]
var shortcode = emoji.shortcode
if (gif == 'yes') {
var emoSource = emoji.url
} else {
var emoSource = emoji.static_url
}
var emoji_url = `
<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}"
<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}"
alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
`
var regExp = new RegExp(':' + shortcode + ':', 'g')
@@ -227,7 +232,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
}
var noticeavatar = ''
if (mix == 'notf') {
if(!toot.status) {
if (!toot.status) {
toot.status = statusModel(toot.created_at)
}
if (gif == 'yes') {
@@ -367,9 +372,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
Object.keys(toot.account.emojis).forEach(function(key5) {
var emoji = toot.account.emojis[key5]
var shortcode = emoji.shortcode
if (gif == 'yes') {
var emoSource = emoji.url
} else {
var emoSource = emoji.static_url
}
var emoji_url = `
<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}"
alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}"
alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
`
var regExp = new RegExp(':' + shortcode + ':', 'g')
dis_name = dis_name.replace(regExp, emoji_url)
})
@@ -418,9 +429,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
Object.keys(toot.account.emojis).forEach(function(key5) {
var emoji = toot.account.emojis[key5]
var shortcode = emoji.shortcode
if (gif == 'yes') {
var emoSource = emoji.url
} else {
var emoSource = emoji.static_url
}
var emoji_url = `
<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}"
alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}"
alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
`
var regExp = new RegExp(':' + shortcode + ':', 'g')
dis_name = dis_name.replace(regExp, emoji_url)
})
@@ -571,7 +588,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
//Poll
var poll = ''
if (toot.poll) {
var poll = pollParse(toot.poll, acct_id)
var poll = pollParse(toot.poll, acct_id, false)
}
var mediack = toot.media_attachments[0]
@@ -831,9 +848,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
Object.keys(toot.emojis).forEach(function(key5) {
var emoji = toot.emojis[key5]
var shortcode = emoji.shortcode
if (gif == 'yes') {
var emoSource = emoji.url
} else {
var emoSource = emoji.static_url
}
var emoji_url = `
<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}"
alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}"
alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
`
var regExp = new RegExp(':' + shortcode + ':', 'g')
content = content.replace(regExp, emoji_url)
spoil = spoil.replace(regExp, emoji_url)
@@ -1037,9 +1060,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
</a>
</div>
<div class="action ${can_rt} ${disp['rt']} ${noauth}">
<a onclick="rt('${uniqueid}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
<a onclick="rt('${toot.id}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
style="padding:0" title="${lang.lang_parse_bt}">
<i class="fas fa-retweet ${if_rt} rt_${uniqueid}"></i>
<i class="fas fa-retweet ${if_rt} rt_${toot.id}"></i>
<span class="rt_ct">${toot.reblogs_count}</span>
</a>
</div>
@@ -1085,28 +1108,26 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
<a onclick="client('${$.strip_tags(via)}')" class="pointer">${lang.lang_parse_clientop}</a>
</div>
<div>
<button onclick="bkm('${toot.id}','${acct_id}','${tlid}')"
<button onclick="bkm('${uniqueid}','${acct_id}','${tlid}')"
class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0">
<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
<span class="bkmStr_${toot.id}">${bkmStr}</span>
<span class="bkmStr_${uniqueid}">${bkmStr}</span>
</button>
</div>
<div class="${if_mine}">
<button onclick="del('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
<button onclick="del('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
style="padding:0">
<i class="fas fa-trash"></i>${lang.lang_parse_del}
</button>
</div>
<div class="${if_mine}">
<button onclick="pin('${
toot.id
}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
<i class="fas fa-map-pin pin_${toot.id} ${if_pin}"></i>
<span class="pinStr_${toot.id}">${pinStr}</span>
<button onclick="pin('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>
<span class="pinStr_${uniqueid}">${pinStr}</span>
</button>
</div>
<div class="${if_mine}">
<button onclick="redraft('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
<button onclick="redraft('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
style="padding:0">
<i class="material-icons">redo</i>${lang.lang_parse_redraft}
</button>
@@ -1138,6 +1159,10 @@ function userparse(obj, auth, acct_id, tlid, popup) {
if (locale == 'yes') {
var locale = false
}
var gif = localStorage.getItem('gif')
if (!gif) {
gif = 'yes'
}
var templete = ''
var datetype = localStorage.getItem('datetype')
Object.keys(obj).forEach(function(key) {
@@ -1167,10 +1192,15 @@ function userparse(obj, auth, acct_id, tlid, popup) {
} else {
var authhtml = ''
}
var ftxt = lang.lang_parse_followed
if (!locale && localStorage.getItem('followlocale_' + acct_id)) {
ftxt = localStorage.getItem('followlocale_' + acct_id)
if (auth == 'follow') {
var ftxt = lang.lang_parse_followed
if (!locale && localStorage.getItem('followlocale_' + acct_id)) {
ftxt = localStorage.getItem('followlocale_' + acct_id)
}
} else if (auth == 'moved') {
var ftxt = lang.lang_parse_moved
}
console.log(auth, ftxt)
if (popup > 0 || popup == -1 || notf) {
var notftext = ftxt + '<br>'
} else {
@@ -1213,9 +1243,15 @@ function userparse(obj, auth, acct_id, tlid, popup) {
Object.keys(toot.emojis).forEach(function(key5) {
var emoji = toot.emojis[key5]
var shortcode = emoji.shortcode
if (gif == 'yes') {
var emoSource = emoji.url
} else {
var emoSource = emoji.static_url
}
var emoji_url = `
<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}"
alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}"
alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
`
var regExp = new RegExp(':' + shortcode + ':', 'g')
dis_name = dis_name.replace(regExp, emoji_url)
})
@@ -1224,7 +1260,11 @@ function userparse(obj, auth, acct_id, tlid, popup) {
dis_name = twemoji.parse(dis_name)
}
if (toot.avatar) {
var avatar = toot.avatar
if (gif == 'yes') {
var avatar = toot.avatar
} else {
var avatar = toot.avatar_static
}
} else {
var avatar = '../../img/missing.svg'
}
@@ -1347,7 +1387,7 @@ function client(name) {
}
}
//Poll Parser
function pollParse(poll, acct_id) {
function pollParse(poll, acct_id, emojis) {
var datetype = localStorage.getItem('datetype')
var anime = localStorage.getItem('animation')
if (anime == 'yes' || !anime) {
@@ -1355,6 +1395,10 @@ function pollParse(poll, acct_id) {
} else {
var lpAnime = ''
}
var gif = localStorage.getItem('gif')
if (!gif) {
gif = 'yes'
}
var choices = poll.options
if (poll.own_votes) {
var minechoice = poll.own_votes
@@ -1388,7 +1432,7 @@ function pollParse(poll, acct_id) {
}
var ended = date(poll.expires_at, datetype)
var pollHtml = ''
if (choices[0].votes_count === 0 || choices[0].votes_count >0) {
if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
var max = _.maxBy(choices, 'votes_count').votes_count
} else {
var max = 0
@@ -1400,7 +1444,8 @@ function pollParse(poll, acct_id) {
for (var i = 0; i < minechoice.length; i++) {
var me = minechoice[i]
if (me == keyc) {
var voteit = '<span class="ownMark"><img class="emoji" draggable="false" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/2705.png"></span>'
var voteit =
'<span class="ownMark"><img class="emoji" draggable="false" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/2705.png"></span>'
break
}
}
@@ -1413,7 +1458,7 @@ function pollParse(poll, acct_id) {
var voteclass = ''
}
var per = Math.ceil((choice.votes_count / poll.votes_count) * 100)
if(!per) per = 0
if (!per) per = 0
if (max == choice.votes_count) {
var addPoll = 'maxVoter'
} else {
@@ -1425,11 +1470,31 @@ function pollParse(poll, acct_id) {
} else {
openData = `<span style="float: right">?<span class="sml">(-%)</span></span>`
}
var choiceText = escapeHTML(choice.title)
if (emojis) {
//絵文字があれば
Object.keys(emojis).forEach(function(key5) {
var emoji = emojis[key5]
var shortcode = emoji.shortcode
if (gif == 'yes') {
var emoSource = emoji.url
} else {
var emoSource = emoji.static_url
}
var emoji_url = `
<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}"
alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
`
var regExp = new RegExp(':' + shortcode + ':', 'g')
choiceText = choiceText.replace(regExp, emoji_url)
})
choiceText = twemoji.parse(choiceText)
}
pollHtml =
pollHtml +
`<div class="${voteclass} vote vote_${acct_id}_${poll.id}_${keyc}" onclick="${votesel}">
<span class="vote_${acct_id}_${poll.id}_result leadPoll ${result_hide} ${addPoll} ${lpAnime}" style="width: ${per}%"></span>
<span class="onPoll">${escapeHTML(choice.title)}${voteit}</span>
<span class="onPoll">${choiceText}${voteit}</span>
<span class="vote_${acct_id}_${poll.id}_result ${result_hide} onPoll">
${openData}
</span>

View File

@@ -120,7 +120,7 @@ function voteMastodonrefresh(acct_id, id) {
if (!json) {
return false
}
var poll = pollParse(json, acct_id)
var poll = pollParse(json, acct_id, json.emojis)
$('.vote_' + acct_id + '_' + json.id).html(poll)
}
}

View File

@@ -53,7 +53,7 @@ function imgCont(type) {
$('#imagemodal').attr('data-image', murl)
//表示はリモートを使うか(どちらにしろコピーはオリジナル)
var remote_img = localStorage.getItem('remote_img')
if (remote_img == 'yes') {
if (remote_img == 'yes' && ourl != 'null') {
murl = ourl
}
if (murl) {
@@ -95,7 +95,7 @@ function imageXhr(id, key, murl) {
'loadend',
function(event) {
var total = event.total
$('#imgbyte').text(Math.floor(total/1024))
$('#imgbyte').text(Math.floor(total / 1024))
var now = event.loaded
var per = (now / total) * 100
$('#imgprog').text(Math.floor(per))
@@ -266,9 +266,8 @@ function dlImg() {
if (remote_img == 'yes') {
murl = ourl
}
if (localStorage.getItem('savefolder')) {
var save = localStorage.getItem('savefolder')
} else {
var save = localStorage.getItem('savefolder')
if (!save || save == 'null') {
var save = ''
}
postMessage(['generalDL', [murl, save, false]], '*')

File diff suppressed because it is too large Load Diff

View File

@@ -1,43 +1,92 @@
function img(mainWindow, dir) {
const electron = require("electron");
const dialog = electron.dialog;
const fs = require("fs");
var Jimp = require("jimp");
var ipc = electron.ipcMain;
const BrowserWindow = electron.BrowserWindow;
ipc.on('file-select', (e, args) => {
dialog.showOpenDialog(null, {
properties: ['openFile', 'multiSelections'],
title: '添付ファイルを選択',
defaultPath: '.',
filters: [
{ name: 'メディアファイル', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'] },
{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
{ name: '動画', extensions: ['mp4', 'webm'] },
{ name: '全てのファイル', extensions: ['*'] }
]
}, (fileNames) => {
if (!fileNames) {
return false;
}
for (var i = 0; i < fileNames.length; i++) {
var path = fileNames[i];
var bin = fs.readFileSync(path, 'base64');
e.sender.webContents.send('bmp-img-comp', [bin, 'new']);
}
});
});
ipc.on('bmp-image', (e, args) => {
var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
Jimp.read(args[0], function (err, lenna) {
if (err) throw err;
lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1]]);
});
});
});
const electron = require('electron')
const dialog = electron.dialog
const fs = require('fs')
var Jimp = require('jimp')
var ipc = electron.ipcMain
const BrowserWindow = electron.BrowserWindow
ipc.on('file-select', (e, args) => {
dialog.showOpenDialog(
null,
{
properties: ['openFile', 'multiSelections'],
title: '添付ファイルを選択',
defaultPath: '.',
filters: [
{
name: 'メディアファイル',
extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm']
},
{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
{ name: '動画', extensions: ['mp4', 'webm'] },
{ name: '全てのファイル', extensions: ['*'] }
]
},
fileNames => {
if (!fileNames) {
return false
}
for (var i = 0; i < fileNames.length; i++) {
var path = fileNames[i]
var bin = fs.readFileSync(path, 'base64')
e.sender.webContents.send('resizeJudgement', [bin, 'new'])
}
}
)
})
ipc.on('bmp-image', (e, args) => {
Jimp.read(args[0], function(err, lenna) {
if (err) throw err
lenna.getBase64(Jimp.MIME_PNG, function(err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1]])
})
})
})
ipc.on('resize-image', (e, args) => {
var ext = args[0].toString().slice(args[0].indexOf('/') + 1, args[0].indexOf(';'))
if (ext == 'jpeg') {
var use = 'MIME_JPEG'
} else {
var use = 'MIME_PNG'
}
var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
var decodedFile = new Buffer(b64, 'base64')
Jimp.read(decodedFile, function(err, lenna) {
if (err) throw err
lenna.scaleToFit(args[1], args[1]).getBase64(Jimp[use], function(err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1]])
})
})
})
ipc.on('stamp-image', (e, args) => {
var text = args[1]
var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
var decodedFile = new Buffer(b64, 'base64')
console.log(text)
Jimp.read(decodedFile, function(err, image) {
if (err) throw err
Jimp.loadFont(Jimp.FONT_SANS_16_BLACK).then(font => {
var evWidth = Jimp.measureText(font, text)
var width = image.bitmap.width
var height = image.bitmap.height
var left = width - evWidth - 10
var top = height - 30
var color = Jimp.intToRGBA(image.getPixelColor(left, top))
console.log(left, top, color)
var ave = (color.r + color.g + color.b) / 3
if (ave > 128) {
image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
})
} else {
Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then(font => {
image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
})
})
}
})
})
})
}
exports.img = img;
exports.img = img

View File

@@ -45,7 +45,7 @@ function system(mainWindow, dir, lang, dirname) {
//エクスポートのダイアログ
ipc.on("exportSettings", function(e, args) {
dialog.showSaveDialog(
null,
mainWindow,
{
title: "Export",
properties: ["openFile", "createDirectory"],
@@ -62,13 +62,14 @@ function system(mainWindow, dir, lang, dirname) {
//インポートのダイアログ
ipc.on("importSettings", function(e, args) {
dialog.showOpenDialog(
null,
mainWindow,
{
title: "Import",
properties: ["openFile"],
filters: [{ name: "TheDesk Config", extensions: ["thedeskconfig", "thedeskconfigv2", "json5"] }]
},
fileNames => {
console.log("imported from: ", fileNames)
if (!fileNames) {
return false;
}
@@ -79,7 +80,7 @@ function system(mainWindow, dir, lang, dirname) {
//保存フォルダのダイアログ
ipc.on("savefolder", function(e, args) {
dialog.showOpenDialog(
null,
mainWindow,
{
title: "Save folder",
properties: ["openDirectory"]
@@ -92,7 +93,7 @@ function system(mainWindow, dir, lang, dirname) {
//カスタムサウンドのダイアログ
ipc.on("customSound", function(e, arg) {
dialog.showOpenDialog(
null,
mainWindow,
{
title: "Custom sound",
properties: ["openFile"],

View File

@@ -1,6 +1,6 @@
{
"name": "thedesk",
"version": "20.0.6",
"version": "20.1.0",
"description": "TheDesk is a Mastodon client for PC.",
"repository": "https://github.com/cutls/TheDesk",
"main": "main.js",
@@ -59,7 +59,7 @@
"json5": "^2.1.1",
"lodash": "^4.17.15",
"sumchecker": "^3.0.0",
"sweetalert2": "^9.4.0",
"sweetalert2": "^9.5.3",
"sumchecker": "^3.0.1",
"sweetalert2": "^9.4.0",
"vue": "^2.6.10"

View File

@@ -205,9 +205,11 @@
<div class="col s12 mize" style="margin-bottom:5px; padding:0;">
<div id="taglist"></div>
<div id="preview" class="mize"></div>
<span class=" sml mize"><span data-trans="reply">@@replyMode@@</span>:
<span id="rec">@@no@@</span>/<span data-trans="file">@@temp@@</span>:
<span id="mec">@@nothing@@</span>/@@poll@@:<span id="pollsta">@@no@@</span>
<span class=" sml mize"><span>@@replyMode@@</span>:
<span id="rec">@@no@@</span>/<span>@@temp@@</span>:
<span id="mec">@@nothing@@</span>
<a onclick="stamp()" class="pointer" title="@@stampWarn@@">@@stamp@@: <span id="stamp">Off</span></a>
/@@poll@@:<span id="pollsta">@@no@@</span>
<span id="vis" class="hide">public</span>
</span>
<br>
@@ -762,19 +764,57 @@
<a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br>
<div id="release-20-0-6_Kawaii" class="release-do" style="display:none; ">><br>
<div id="release-20-1-0_Kawaii" class="release-do" style="display:none; ">><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>をご覧ください。
<h5>Release Note 20.0.6 (Kawaii)</h5>
支援ダイアログが消えない
<h5>Release Note 20.1.0 (Kawaii)</h5>
画像のページ送りに失敗する
<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
</a><br>
ステータスが虚無なことがある
Pleromaのmove通知タイプの対応
<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
</a><br>
・ブーストやお気に入りが解除できなくなるバグの修正(進行中)
<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
</a><br>
・保存先フォルダが表示されないバグの修正
<a onclick="udgEx('micchan83@fedibird.com','main')" class="contributor">
<img src="https://user-images.githubusercontent.com/17561618/67261210-a46a7980-f4da-11e9-9c9c-704757d3b1a7.png">micchan83
</a>
<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
</a>
<br>
・ブーストされた投票で最も投票された選択肢の背景色がブースト背景色と一緒で見えにくかった
<a onclick="udgEx('kPherox@pl.kpherox.dev','main')" class="contributor">
<img src="https://user-images.githubusercontent.com/17561618/66582379-a3714800-ebbc-11e9-8402-d81a35a3be9f.png">kPherox
</a>
<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
</a><br>
・インポートやエクスポートで直接中身をやりとりする方法を追加
<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
</a><br>
・画像の長辺リサイズ(デフォルトはオフ)
<a onclick="udgEx('popn_ja@popon.pptdn.jp','main')" class="contributor">
<img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4">kaias1jp
</a>
<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
</a><br>
・画像に自分のアカウント名(acct@aaa.tld)を入れるボタン(アップロード前に押す)
<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
</a><br>
・削除して再編集に関するバグの修正
<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
</a> 他匿名報告者等<br>
</div>
<div id="release-en" style="display:none">
<h5>Let's make it native!</h5>
@@ -1132,11 +1172,11 @@
<div id="support-btm" class="z-depth-4 hide">
<div id="support-btm-ja">
<h5>ご支援いただけませんか?</h5>
(これは支援の有無に関わらず定期的に出ます。)<br>
(これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)<br>
あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。<br>
乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。<br>
ご安心ください。インターネット上のフリー百科事典のような高圧的支援要求はいたしません。コーヒーも要求いたしません。<br>
(中略)<br>
<br>
TheDeskになぜ金銭が発生するかについて: 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。<br>
<b>全てのユーザーが安心してTheDeskを使っていただける環境のため</b>にも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。<br>
<b>@@TheDeskDes@@</b>
</div>

View File

@@ -20,6 +20,8 @@
"yes":"Yes",
"temp":"Attaching files",
"nothing":"None",
"stamp": "Stamp",
"stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
"vis":"Adjust status privacy",
"cwtext":"Warning text",
"selectVis":"Adjust status privacy",

View File

@@ -193,6 +193,7 @@
"lang_parse_detail": "Details",
"lang_parse_redraft": "Delete & re-draft",
"lang_parse_followed": "Followed you",
"lang_parse_moved": "Moved to...",
"lang_parse_clientop": "Operation of this client",
"lang_parse_clienttxt": " will be",
"lang_parse_clientno": "done nothing",

View File

@@ -10,6 +10,7 @@
"env": "System Preferences",
"setlang": "Languages",
"backup": "Import and export of preferences",
"backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
"import": "Import",
"export": "Export",
"hardwareAcceleration": "Disable hardware acceleration",
@@ -137,6 +138,8 @@
"nothing": "Hidden",
"localonly": "Local Only",
"zeroWidthEmoji": "Zero-width space when inserting emojis",
"uploadCrop": "Auto scale to fit",
"uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
"keysc": "Keyboard shortcut Preferences",
"iks": "Easy inserter",
"okswarn": "You can insert any letters and emojis with only 3 keys",

View File

@@ -193,6 +193,7 @@
"lang_parse_det": "詳細(メインアカウント経由)",
"lang_parse_redraft": "このトゥートを削除して再編集",
"lang_parse_followed": "フォローしてもろた。",
"lang_parse_moved": "他のサーバー行ったで",
"lang_parse_clientop": "クライアント操作",
"lang_parse_clienttxt": " どうする?",
"lang_parse_clientno": "何もせえへん",

View File

@@ -136,6 +136,8 @@
"nothing": "表示しない",
"localonly": "ローカル限定",
"zeroWidthEmoji": "絵文字にゼロ幅スペースを使う",
"uploadCrop": "添付画像の自動リサイズ",
"uploadCropWarn": "最大の長辺ピクセル指定。JPEG以外は勝手にPNGイメージに変換するで。GIFアニメに注意しいや。0に設定するとリサイズせんで。",
"keysc": "キーボードショートカットの設定",
"iks": "簡単文字入力",
"okswarn": "絵文字やタグ、&gt;BTなどを登録しておくとすぐに使えてええ感じや。",

View File

@@ -20,6 +20,8 @@
"yes":"はい",
"temp":"添付ファイル",
"nothing":"なし",
"stamp": "スタンプ",
"stampWarn": "画像右下にアカウント名(aa@bb.cc)テキストを挿入します",
"vis":"公開範囲",
"cwtext":"警告文",
"selectVis":"公開範囲指定",

View File

@@ -193,6 +193,7 @@
"lang_parse_det": "詳細(メインアカウント経由)",
"lang_parse_redraft": "削除して再編集",
"lang_parse_followed": "フォローされました。",
"lang_parse_moved": "引っ越ししました。",
"lang_parse_clientop": "クライアント操作",
"lang_parse_clienttxt": " に対する処理を選択してください。",
"lang_parse_clientno": "何もしない",

View File

@@ -10,6 +10,7 @@
"env": "環境設定",
"setlang": "言語",
"backup": "設定のインポートとエクスポート",
"backupWarn": "インポートできない場合、ここにバックアップデータの中身をコピーしてください。",
"import": "インポート",
"export": "エクスポート",
"hardwareAcceleration": "ハードウェアアクセラレーションの無効化",
@@ -137,6 +138,8 @@
"nothing": "表示しない",
"localonly": "ローカル限定",
"zeroWidthEmoji": "絵文字にゼロ幅スペースを使う",
"uploadCrop": "添付画像の自動リサイズ",
"uploadCropWarn": "最大の長辺ピクセル指定。JPEG以外は自動でPNGイメージに変換されます。大きなGIFアニメは静止画になります。0に設定するとリサイズしません。",
"keysc": "キーボードショートカットの設定",
"iks": "簡単文字入力",
"okswarn": "絵文字やタグ、&gt;BTなどを登録しておくとすぐに入力できます。",

View File

@@ -1,4 +1,4 @@
let ver = '20.0.6 (Kawaii)'
let ver = '20.1.0 (Kawaii)'
if (process.argv.indexOf('--automatic') === -1) {
let input = require('readline-sync').question('version string [empty: ' + ver + ' (default)]? ')
if (input) {

View File

@@ -52,7 +52,9 @@
<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
style="width:100%; max-width:200px;">@@export@@</button>
<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
style="width:100%; max-width:200px;">@@import@@</button>
style="width:100%; max-width:200px;">@@import@@</button><br>
@@backupWarn@@<br>
<input type="text" id="imp-exp" style="width: 300px">
<div id="envView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>

View File

@@ -658,5 +658,17 @@ var postConstruction = [
desc: '',
checkbox: yesno
}
},{
id: 'uploadCrop',
storage: 'uploadCrop',
checkbox: false,
doubleText: false,
width: 100,
setValue: '0',
text: {
head: '@@uploadCrop@@',
desc: '@@uploadCropWarn@@',
after: 'px'
}
}
]

View File

@@ -2713,9 +2713,9 @@ supports-color@^5.3.0:
has-flag "^3.0.0"
sweetalert2@^9.4.0:
version "9.4.0"
resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.4.0.tgz#7dc06b09b830e201b5a51a2c84e52af3b8f396be"
integrity sha512-c9Azg2eVXIgaYV9Su2tRbRip7YD3baGwl9S7yKVdELu9E7rEcER+WBeJenVjR6kRGC426ggMFUgLTf0l/LUb1Q==
version "9.5.3"
resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.5.3.tgz#b280e218dc387a96fa2b6175b50d75421a708f7d"
integrity sha512-4wzLUCmVby3NPQC8XHp0HRJgTm5tbAO7OOaqabATNe0U6JN/oyBTS7iJJG9V83MpcP6MLDUEWcGO/Y8i6g2jYw==
tar@^4.4.12:
version "4.4.13"