Add: get images from remote

This commit is contained in:
cutls 2019-11-09 00:09:39 +09:00
parent 472e9268a1
commit bd11f7da50
5 changed files with 660 additions and 580 deletions

View File

@ -146,8 +146,8 @@ function filter() {
<a onclick="filterEdit('${filterword.id}','${acct_id}')" class="pointer"> <a onclick="filterEdit('${filterword.id}','${acct_id}')" class="pointer">
${lang.lang_edit} ${lang.lang_edit}
</a>/ </a>/
<a onclick="filterDel('${filterword.id}','${acct_id}')" class="pointer">' + <a onclick="filterDel('${filterword.id}','${acct_id}')" class="pointer">
${lang.lang_del}' ${lang.lang_del}
</a><br> ` </a><br> `
}) })
if (filters == '') { if (filters == '') {

View File

@ -7,6 +7,9 @@ function imgv(id, key, acct_id) {
$('#imgmodal').attr('src', '../../img/loading.svg') $('#imgmodal').attr('src', '../../img/loading.svg')
var murl = $('#' + id + '-image-' + key).attr('data-url') var murl = $('#' + id + '-image-' + key).attr('data-url')
var ourl = $('#' + id + '-image-' + key).attr('data-original') var ourl = $('#' + id + '-image-' + key).attr('data-original')
if (!ourl || ourl == 'null') {
ourl = murl
}
var type = $('#' + id + '-image-' + key).attr('data-type') var type = $('#' + id + '-image-' + key).attr('data-type')
$('#imagemodal').attr('data-id', id) $('#imagemodal').attr('data-id', id)
$('#imagemodal').attr('data-acct', acct_id) $('#imagemodal').attr('data-acct', acct_id)
@ -72,7 +75,7 @@ function imgCont(type) {
} }
} }
function imageXhr(id, key, murl) { function imageXhr(id, key, murl) {
var startTime = new Date(); var startTime = new Date()
xhr = new XMLHttpRequest() xhr = new XMLHttpRequest()
xhr.open('GET', murl, true) xhr.open('GET', murl, true)
xhr.responseType = 'arraybuffer' xhr.responseType = 'arraybuffer'
@ -148,7 +151,7 @@ function imageXhr(id, key, murl) {
$('#image-prev').prop('disabled', false) $('#image-prev').prop('disabled', false)
} }
element.src = b64 element.src = b64
var endTime = new Date(); var endTime = new Date()
var proctime = endTime.getTime() - startTime.getTime() var proctime = endTime.getTime() - startTime.getTime()
$('#imgsec').text(proctime) $('#imgsec').text(proctime)
$('#imgmodal').attr('src', b64) $('#imgmodal').attr('src', b64)

View File

@ -98,6 +98,8 @@
"animation": "Animation of timelines", "animation": "Animation of timelines",
"markers": "Markers(mark as read) on HTL and notifications", "markers": "Markers(mark as read) on HTL and notifications",
"markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.", "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
"remote_img": "Get images from the remote server",
"remote_imgWarn": "All previews are got from your loginned cache server.",
"replySound": "Sound(Reply)", "replySound": "Sound(Reply)",
"favSound": "Sound(Fav)", "favSound": "Sound(Fav)",
"btSound": "Sound(Boost)", "btSound": "Sound(Boost)",

View File

@ -98,6 +98,8 @@
"animation": "タイムラインのアニメーション", "animation": "タイムラインのアニメーション",
"markers": "ホームと通知の未読管理", "markers": "ホームと通知の未読管理",
"markerswarn": "Mastodon 3.0相当以上。WebUIと対応クライアントで共有されます。", "markerswarn": "Mastodon 3.0相当以上。WebUIと対応クライアントで共有されます。",
"remote_img": "画像をリモートから取得",
"remote_imgWarn": "プレビューはログインサーバーのキャッシュから取得されます。ビューワーのみに適用されます。",
"replySound": "リプライの通知音", "replySound": "リプライの通知音",
"favSound": "お気に入り登録の通知音", "favSound": "お気に入り登録の通知音",
"btSound": "ブーストの通知音", "btSound": "ブーストの通知音",

File diff suppressed because it is too large Load Diff