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

Fix: when failed to upload

Browse Source
This commit is contained in:
Cutls 2019-07-12 01:01:24 +09:00
parent d92570fa3b
commit eb02dd2986
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/js/common/keyshortcut.js
View File

@ -243,7 +243,6 @@ function tootSelector(column, toot) {
var scr = $('.tl-box[tlid=' + column + ']').scrollTop() var scr = $('.tl-box[tlid=' + column + ']').scrollTop()
var elem = $('.selectedToot').offset().top var elem = $('.selectedToot').offset().top
var top = elem - $('.tl-box').height() + scr var top = elem - $('.tl-box').height() + scr
console.log(elem, top, scr)
if (top > 0) { if (top > 0) {
top = top + $('.selectedToot').height() top = top + $('.selectedToot').height()
if(top > scr){ if(top > scr){

1
app/js/lang/lang.en.js
View File

@ -47,6 +47,7 @@ var lang = {
//post/img.js //post/img.js
"lang_postimg_previewdis": "cannot preview", "lang_postimg_previewdis": "cannot preview",
"lang_postimg_aftupload": "You cannot change accounts after uploading.", "lang_postimg_aftupload": "You cannot change accounts after uploading.",
"lang_postimg_failupload": "Failed",
"lang_postimg_delete": "Delete this image.", "lang_postimg_delete": "Delete this image.",
//post/post.js //post/post.js
"lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?", "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",

7
app/js/lang/lang.ja.js
View File

@ -47,6 +47,7 @@ var lang = {
//post/img.js //post/img.js
"lang_postimg_previewdis": "プレビューできません。", "lang_postimg_previewdis": "プレビューできません。",
"lang_postimg_aftupload": "アップロード後はアカウントを切り替えられません。", "lang_postimg_aftupload": "アップロード後はアカウントを切り替えられません。",
"lang_postimg_failupload": "アップロードに失敗しました。",
"lang_postimg_delete": "この画像を削除します", "lang_postimg_delete": "この画像を削除します",
//post/post.js //post/post.js
"lang_post_tagTL": "デフォルトタグが挿入されていません。このまま投稿するとローカルには表示されません。", "lang_post_tagTL": "デフォルトタグが挿入されていません。このまま投稿するとローカルには表示されません。",
@ -131,8 +132,8 @@ var lang = {
"lang_layout_excludingbt": "BT表示(OFF/BT除外/BTのみ)", "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTのみ)",
"lang_layout_leftFold": "左へ重ねる", "lang_layout_leftFold": "左へ重ねる",
"lang_layout_leftUnfold": "右へ出す", "lang_layout_leftUnfold": "右へ出す",
"lang_layout_deleteColumn":"カラム削除", "lang_layout_deleteColumn": "カラム削除",
"lang_layout_deleteColumnDesc":"カラムを削除しますか？", "lang_layout_deleteColumnDesc": "カラムを削除しますか？",
//ui/sort.js //ui/sort.js
"lang_sort_gothis": "このカラムへ", "lang_sort_gothis": "このカラムへ",
"lang_sort_remthis": "このカラムを削除", "lang_sort_remthis": "このカラムを削除",
@ -201,7 +202,7 @@ var lang = {
"lang_parse_thread": "会話を表示", "lang_parse_thread": "会話を表示",
"lang_parse_unknown": "添付ファイル", "lang_parse_unknown": "添付ファイル",
"lang_parse_nsfw": "閲覧注意", "lang_parse_nsfw": "閲覧注意",
"lang_parse_notffilter":"このユーザーの通知のみを表示", "lang_parse_notffilter": "このユーザーの通知のみを表示",
//misskey //misskey
"lang_misskeyparse_renote": "再投稿", "lang_misskeyparse_renote": "再投稿",
"lang_misskeyparse_renoteqt": "引用", "lang_misskeyparse_renoteqt": "引用",

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

@ -120,6 +120,16 @@ function media(b64, type, no) {
httpreq.onreadystatechange = function () { httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) { if (httpreq.readyState === 4) {
var json = httpreq.response; var json = httpreq.response;
if (!json.id) {
todc();
$("#imgup").text("");
$(".toot-btn-group").prop("disabled", false);
$("#post-acct-sel").prop("disabled", false);
$('select').formSelect();
$("#imgsel").show();
M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
return false
}
var img = localStorage.getItem("img"); var img = localStorage.getItem("img");
if (json.type.indexOf("image") != -1) { if (json.type.indexOf("image") != -1) {
var html = '<img src="' + json[previewer] + '" class="preview-img pointer" data-media="' + json["id"] + '" onclick="deleteImage(\'' + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">'; var html = '<img src="' + json[previewer] + '" class="preview-img pointer" data-media="' + json["id"] + '" onclick="deleteImage(\'' + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">';