diff --git a/app/js/tl/filter.js b/app/js/tl/filter.js index d3eeeff4..5018b878 100644 --- a/app/js/tl/filter.js +++ b/app/js/tl/filter.js @@ -146,8 +146,8 @@ function filter() { ${lang.lang_edit} / - ' + - ${lang.lang_del}' + + ${lang.lang_del}
` }) if (filters == '') { diff --git a/app/js/ui/img.js b/app/js/ui/img.js index 07f7932d..639d5070 100644 --- a/app/js/ui/img.js +++ b/app/js/ui/img.js @@ -7,6 +7,9 @@ function imgv(id, key, acct_id) { $('#imgmodal').attr('src', '../../img/loading.svg') var murl = $('#' + id + '-image-' + key).attr('data-url') var ourl = $('#' + id + '-image-' + key).attr('data-original') + if (!ourl || ourl == 'null') { + ourl = murl + } var type = $('#' + id + '-image-' + key).attr('data-type') $('#imagemodal').attr('data-id', id) $('#imagemodal').attr('data-acct', acct_id) @@ -72,7 +75,7 @@ function imgCont(type) { } } function imageXhr(id, key, murl) { - var startTime = new Date(); + var startTime = new Date() xhr = new XMLHttpRequest() xhr.open('GET', murl, true) xhr.responseType = 'arraybuffer' @@ -148,7 +151,7 @@ function imageXhr(id, key, murl) { $('#image-prev').prop('disabled', false) } element.src = b64 - var endTime = new Date(); + var endTime = new Date() var proctime = endTime.getTime() - startTime.getTime() $('#imgsec').text(proctime) $('#imgmodal').attr('src', b64) diff --git a/app/view/make/language/en/setting.json b/app/view/make/language/en/setting.json index 37921f0e..786f1f3d 100644 --- a/app/view/make/language/en/setting.json +++ b/app/view/make/language/en/setting.json @@ -98,6 +98,8 @@ "animation": "Animation of timelines", "markers": "Markers(mark as read) on HTL and notifications", "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)", "favSound": "Sound(Fav)", "btSound": "Sound(Boost)", diff --git a/app/view/make/language/ja/setting.json b/app/view/make/language/ja/setting.json index 4c12fad9..f63183f4 100644 --- a/app/view/make/language/ja/setting.json +++ b/app/view/make/language/ja/setting.json @@ -98,6 +98,8 @@ "animation": "タイムラインのアニメーション", "markers": "ホームと通知の未読管理", "markerswarn": "Mastodon 3.0相当以上。WebUIと対応クライアントで共有されます。", + "remote_img": "画像をリモートから取得", + "remote_imgWarn": "プレビューはログインサーバーのキャッシュから取得されます。ビューワーのみに適用されます。", "replySound": "リプライの通知音", "favSound": "お気に入り登録の通知音", "btSound": "ブーストの通知音", diff --git a/app/view/make/setting.sample.js b/app/view/make/setting.sample.js index 46ae4a5c..64f56f25 100644 --- a/app/view/make/setting.sample.js +++ b/app/view/make/setting.sample.js @@ -1,578 +1,651 @@ var yesno = [ - { - text: "@@yes@@", - value: "yes" - }, { - text: "@@no@@", - value: "no" - } -]; -var sound = [ - { - text: "@@none@@", - value: "none" - }, { - text: "@@default@@", - value: "default" - }, { - text: "Custom 1", - value: "c1" - }, { - text: "Custom 2", - value: "c2" - }, { - text: "Custom 3", - value: "c3" - }, { - text: "Custom 4", - value: "c4" - } -]; -var envConstruction = [ - { - id: "popup", - storage: "popup", - checkbox: false, - doubleText: false, - setValue: 0, - width: 50, - text: { - head: "@@popup@@", - desc: "@@popupwarn@@", - after: "@@s@@" - } - }, { - id: "notf", - storage: "nativenotf", - checkbox: true, - setValue: "yes", - text: { - head: "@@nativenotf@@", - desc: "@@nnwarn@@", - checkbox: yesno - } - }, { - id: "width", - storage: "width", - checkbox: false, - doubleText: false, - width: 50, - setValue: 300, - text: { - head: "@@minwidth@@", - desc: "@@minwidthwarn@@", - after: "px @@above@@" - } - }, { - id: "fixwidth", - storage: "fixwidth", - checkbox: false, - doubleText: false, - setValue: 300, - width: 50, - text: { - head: "@@fixwidth@@", - desc: "@@fixwidthwarn@@", - after: "px @@above@@" - } - }, { - id: "size", - storage: "size", - checkbox: false, - doubleText: false, - width: 50, - setValue: 13, - text: { - head: "@@fontsize@@", - desc: "13px(@@absolute@@)", - after: "px" - } - }, { - id: "ha", - storage: "ha", - checkbox: true, - setValue: false, - text: { - head: "@@hardwareAcceleration@@", - desc: "@@hardwareAccelerationWarn@@", - checkbox: [ - { - text: "@@yes@@", - value: "true" - }, { - text: "@@no@@", - value: "false" - } - ] - } - }, - { - id: "ua", - storage: "ua_setting", - checkbox: false, - doubleText: false, - setValue: "", - width: 200, - text: { - head: "@@useragent@@", - desc: "@@useragentWarn@@" - } - } -]; -var tlConstruction = [ - { - id: "time", - storage: "datetype", - checkbox: true, - setValue: "absolute", - text: { - head: "@@timemode@@", - desc: "@@relativetime@@
@@absolutetime@@
@@mixtime@@", - checkbox: [ - { - text: "@@relativesel@@", - value: "relative" - }, { - text: "@@absolutesel@@", - value: "absolute" - }, { - text: "@@doublesel@@", - value: "double" - }, { - text: "@@mixsel@@", - value: "medium" - } - - ] - } - }, { - id: "ul", - storage: "locale", - checkbox: true, - setValue: "yes", - text: { - head: "@@locale@@", - desc: "@@localewarn@@", - checkbox: yesno - } - }, { - id: "nsfw", - storage: "nsfw", - checkbox: true, - setValue: "yes", - text: { - head: "@@nswf@@", - desc: "@@nsfwwarn@@", - checkbox: yesno - } - }, { - id: "cw", - storage: "cw", - checkbox: true, - setValue: "yes", - text: { - head: "@@cw@@", - desc: "", - checkbox: yesno - } - }, { - id: "rp", - storage: "replyct", - checkbox: true, - setValue: "hidden", - text: { - head: "@@replyct@@", - desc: "", - checkbox: [ - { - text: "@@replyct_hidden@@", - value: "hidden" - }, { - text: "@@replyct_full@@", - value: "all" - } - - ] - } - }, { - id: "gif", - storage: "gif", - checkbox: true, - setValue: "yes", - text: { - head: "@@gif@@", - desc: "", - checkbox: yesno - } - }, { - id: "tag", - storage: "tag-range", - checkbox: true, - setValue: "local", - text: { - head: "@@tag@@", - desc: "", - checkbox: [ - { - text: "@@tagfed@@", - value: "all" - }, { - text: "@@taglocal@@", - value: "local" - } - - ] - } - }, { - id: "via", - storage: "viashow", - checkbox: true, - setValue: "no", - text: { - head: "@@via@@", - desc: "", - checkbox: yesno - } - }, { - id: "mov", - storage: "mouseover", - checkbox: true, - setValue: "no", - text: { - head: "@@mouseover@@", - desc: "@@mouseoverwarn@@", - checkbox: [ - { - text: "@@mv@@", - value: "yes" - }, { - text: "@@mvclick@@", - value: "click" - }, { - text: "@@no@@", - value: "no" - } - - ] - } - }, { - id: "notfm", - storage: "setasread", - checkbox: true, - setValue: "yes", - text: { - head: "@@notfmarker@@", - desc: "", - checkbox: yesno - } - }, { - checkbox: false, - doubleText: true, - data: [ - { - id: "sentence", - storage: "sentence", - width: 50, - setValue: 500, - text: { after: "@@lines@@ @@above@@ @@or@@" } - }, { - id: "letters", - storage: "letters", - width: 50, - setValue: 7000, - text: { after: "@@letters@@ @@above@@" } - } - ], - text: { - head: "@@autofold@@", - desc: "@@autofoldwarn@@", - } - }, { - id: "img-height", - storage: "img-height", - checkbox: false, - doubleText: false, - width: 80, - setValue: 200, - text: { - head: "@@imgheight@@", - desc: "@@imgheightwarn@@", - after: "px" - } - }, { - id: "ticker", - storage: "ticker_ok", - checkbox: true, - setValue: "no", - text: { - head: "@@ticker@@", - desc: "@@tickerwarn@@", - checkbox: yesno - } - }, { - id: "anime", - storage: "animation", - checkbox: true, - setValue: "yes", - text: { - head: "@@animation@@", - desc: "", - checkbox: yesno - } - }, { - id: "markers", - storage: "markers", - checkbox: true, - setValue: "no", - text: { - head: "@@markers@@", - desc: "@@markerswarn@@", - checkbox: yesno - } - }, { - id: "replySound", - storage: "replySound", - checkbox: true, - setValue: "none", - text: { - head: "@@replySound@@", - desc: "", - checkbox: sound - } - }, { - id: "favSound", - storage: "favSound", - checkbox: true, - setValue: "none", - text: { - head: "@@favSound@@", - desc: "", - checkbox: sound - } - }, { - id: "btSound", - storage: "btSound", - checkbox: true, - setValue: "none", - text: { - head: "@@btSound@@", - desc: "", - checkbox: sound - } - }, { - id: "followSound", - storage: "followSound", - checkbox: true, - setValue: "none", - text: { - head: "@@followSound@@", - desc: "", - checkbox: sound - } - } -]; -var postConstruction = [ - { - id: "cw-text", - storage: "cw-text", - checkbox: false, - doubleText: false, - width: 150, - setValue: "", - text: { - head: "@@defaultcw@@", - desc: "", - after: "" - } - }, { - checkbox: false, - doubleText: true, - data: [ - { - id: "cw_sentence", - storage: "cw_sentence", - width: 50, - setValue: 500, - text: { after: "@@lines@@ @@above@@ @@or@@" } - }, { - id: "cw_letters", - storage: "cw_letters", - width: 50, - setValue: 7000, - text: { after: "@@letters@@ @@above@@" } - } - ], - text: { - head: "@@autocw@@", - desc: "@@autocwwarn@@", - } - }, { - id: "cws", - storage: "always-cw", - checkbox: true, - setValue: "no", - text: { - head: "@@cws@@", - desc: "", - checkbox: yesno - } - }, { - id: "vis", - storage: "vis", - checkbox: true, - setValue: "public", - text: { - head: "@@defaultvis@@", - desc: "", - checkbox: [ - { - text: "@@public@@", - value: "public" - }, { - text: "@@unlisted@@", - value: "unlisted" - }, { - text: "@@private@@", - value: "private" - }, { - text: "@@direct@@", - value: "direct" - }, { - text: "@@memory@@", - value: "memory" - }, { - text: "@@useapi@@", - value: "useapi" - } - ] - } - }, { - id: "img", - storage: "img", - checkbox: true, - setValue: "no-act", - text: { - head: "@@postimg@@", - desc: "", - checkbox: [ - { - text: "@@showurl@@", - value: "url" - }, { - text: "@@nourl@@", - value: "no-act" - } - ] - } - }, { - id: "box", - storage: "box", - checkbox: true, - setValue: "yes", - text: { - head: "@@box@@", - desc: "", - checkbox: [ - { - text: "@@boxyes@@", - value: "yes" - }, { - text: "@@boxno@@", - value: "no" - }, { - text: "@@boxabs@@", - value: "absolute" - } - ] - } - }, { - id: "quote", - storage: "quote", - checkbox: true, - setValue: "nothing", - text: { - head: "@@quote@@", - desc: "", - checkbox: [ - { - text: "@@simple@@", - value: "simple" - }, { - text: "@@mention@@", - value: "mention" - }, { - text: "@@full@@", - value: "full" - }, { - text: "@@apiQuote@@", - value: "apiQuote", - quote: true - }, { - text: "@@notqt@@", - value: "nothing" - } - ] - } - }, { - id: "main", - storage: "mainuse", - checkbox: true, - setValue: "remain", - text: { - head: "@@main@@", - desc: "@@mainwarn@@", - checkbox: [ - { - text: "@@lastacct@@", - value: "remain" - }, { - text: "@@usemainacct@@", - value: "main" - } - ] - } - }, { - id: "sec", - storage: "sec", - checkbox: true, - setValue: "public", - text: { - head: "@@secondary@@", - desc: "", - checkbox: [ - { - text: "@@nothing@@", - value: "nothing" - }, { - text: "@@public@@", - value: "public" - }, { - text: "@@unlisted@@", - value: "unlisted" - }, { - text: "@@private@@", - value: "private" - }, { - text: "@@direct@@", - value: "direct" - }, { - text: "@@localonly@@", - value: "local", - kirishima: true, - kirishimaText: "非対応インスタンスでは「未収載」になります。" - } - ] - } - }, { - id: "zero", - storage: "emoji-zero-width", - checkbox: true, - setValue: "normal", - setValue: "no", - text: { - head: "@@zeroWidthEmoji@@", - desc: "", - checkbox: yesno - } - } + { + text: '@@yes@@', + value: 'yes' + }, + { + text: '@@no@@', + value: 'no' + } +] +var sound = [ + { + text: '@@none@@', + value: 'none' + }, + { + text: '@@default@@', + value: 'default' + }, + { + text: 'Custom 1', + value: 'c1' + }, + { + text: 'Custom 2', + value: 'c2' + }, + { + text: 'Custom 3', + value: 'c3' + }, + { + text: 'Custom 4', + value: 'c4' + } +] +var envConstruction = [ + { + id: 'popup', + storage: 'popup', + checkbox: false, + doubleText: false, + setValue: 0, + width: 50, + text: { + head: '@@popup@@', + desc: '@@popupwarn@@', + after: '@@s@@' + } + }, + { + id: 'notf', + storage: 'nativenotf', + checkbox: true, + setValue: 'yes', + text: { + head: '@@nativenotf@@', + desc: '@@nnwarn@@', + checkbox: yesno + } + }, + { + id: 'width', + storage: 'width', + checkbox: false, + doubleText: false, + width: 50, + setValue: 300, + text: { + head: '@@minwidth@@', + desc: '@@minwidthwarn@@', + after: 'px @@above@@' + } + }, + { + id: 'fixwidth', + storage: 'fixwidth', + checkbox: false, + doubleText: false, + setValue: 300, + width: 50, + text: { + head: '@@fixwidth@@', + desc: '@@fixwidthwarn@@', + after: 'px @@above@@' + } + }, + { + id: 'size', + storage: 'size', + checkbox: false, + doubleText: false, + width: 50, + setValue: 13, + text: { + head: '@@fontsize@@', + desc: '13px(@@absolute@@)', + after: 'px' + } + }, + { + id: 'ha', + storage: 'ha', + checkbox: true, + setValue: false, + text: { + head: '@@hardwareAcceleration@@', + desc: '@@hardwareAccelerationWarn@@', + checkbox: [ + { + text: '@@yes@@', + value: 'true' + }, + { + text: '@@no@@', + value: 'false' + } + ] + } + }, + { + id: 'ua', + storage: 'ua_setting', + checkbox: false, + doubleText: false, + setValue: '', + width: 200, + text: { + head: '@@useragent@@', + desc: '@@useragentWarn@@' + } + } +] +var tlConstruction = [ + { + id: 'time', + storage: 'datetype', + checkbox: true, + setValue: 'absolute', + text: { + head: '@@timemode@@', + desc: '@@relativetime@@
@@absolutetime@@
@@mixtime@@', + checkbox: [ + { + text: '@@relativesel@@', + value: 'relative' + }, + { + text: '@@absolutesel@@', + value: 'absolute' + }, + { + text: '@@doublesel@@', + value: 'double' + }, + { + text: '@@mixsel@@', + value: 'medium' + } + ] + } + }, + { + id: 'ul', + storage: 'locale', + checkbox: true, + setValue: 'yes', + text: { + head: '@@locale@@', + desc: '@@localewarn@@', + checkbox: yesno + } + }, + { + id: 'nsfw', + storage: 'nsfw', + checkbox: true, + setValue: 'yes', + text: { + head: '@@nswf@@', + desc: '@@nsfwwarn@@', + checkbox: yesno + } + }, + { + id: 'cw', + storage: 'cw', + checkbox: true, + setValue: 'yes', + text: { + head: '@@cw@@', + desc: '', + checkbox: yesno + } + }, + { + id: 'rp', + storage: 'replyct', + checkbox: true, + setValue: 'hidden', + text: { + head: '@@replyct@@', + desc: '', + checkbox: [ + { + text: '@@replyct_hidden@@', + value: 'hidden' + }, + { + text: '@@replyct_full@@', + value: 'all' + } + ] + } + }, + { + id: 'gif', + storage: 'gif', + checkbox: true, + setValue: 'yes', + text: { + head: '@@gif@@', + desc: '', + checkbox: yesno + } + }, + { + id: 'tag', + storage: 'tag-range', + checkbox: true, + setValue: 'local', + text: { + head: '@@tag@@', + desc: '', + checkbox: [ + { + text: '@@tagfed@@', + value: 'all' + }, + { + text: '@@taglocal@@', + value: 'local' + } + ] + } + }, + { + id: 'via', + storage: 'viashow', + checkbox: true, + setValue: 'no', + text: { + head: '@@via@@', + desc: '', + checkbox: yesno + } + }, + { + id: 'mov', + storage: 'mouseover', + checkbox: true, + setValue: 'no', + text: { + head: '@@mouseover@@', + desc: '@@mouseoverwarn@@', + checkbox: [ + { + text: '@@mv@@', + value: 'yes' + }, + { + text: '@@mvclick@@', + value: 'click' + }, + { + text: '@@no@@', + value: 'no' + } + ] + } + }, + { + id: 'notfm', + storage: 'setasread', + checkbox: true, + setValue: 'yes', + text: { + head: '@@notfmarker@@', + desc: '', + checkbox: yesno + } + }, + { + checkbox: false, + doubleText: true, + data: [ + { + id: 'sentence', + storage: 'sentence', + width: 50, + setValue: 500, + text: { after: '@@lines@@ @@above@@ @@or@@' } + }, + { + id: 'letters', + storage: 'letters', + width: 50, + setValue: 7000, + text: { after: '@@letters@@ @@above@@' } + } + ], + text: { + head: '@@autofold@@', + desc: '@@autofoldwarn@@' + } + }, + { + id: 'img-height', + storage: 'img-height', + checkbox: false, + doubleText: false, + width: 80, + setValue: 200, + text: { + head: '@@imgheight@@', + desc: '@@imgheightwarn@@', + after: 'px' + } + }, + { + id: 'ticker', + storage: 'ticker_ok', + checkbox: true, + setValue: 'no', + text: { + head: '@@ticker@@', + desc: '@@tickerwarn@@', + checkbox: yesno + } + }, + { + id: 'anime', + storage: 'animation', + checkbox: true, + setValue: 'yes', + text: { + head: '@@animation@@', + desc: '', + checkbox: yesno + } + }, + { + id: 'markers', + storage: 'markers', + checkbox: true, + setValue: 'no', + text: { + head: '@@markers@@', + desc: '@@markerswarn@@', + checkbox: yesno + } + }, + { + id: 'remote_img', + storage: 'remote_img', + checkbox: true, + setValue: 'no', + text: { + head: '@@remote_img@@', + desc: '@@remote_imgWarn@@', + checkbox: yesno + } + }, + { + id: 'replySound', + storage: 'replySound', + checkbox: true, + setValue: 'none', + text: { + head: '@@replySound@@', + desc: '', + checkbox: sound + } + }, + { + id: 'favSound', + storage: 'favSound', + checkbox: true, + setValue: 'none', + text: { + head: '@@favSound@@', + desc: '', + checkbox: sound + } + }, + { + id: 'btSound', + storage: 'btSound', + checkbox: true, + setValue: 'none', + text: { + head: '@@btSound@@', + desc: '', + checkbox: sound + } + }, + { + id: 'followSound', + storage: 'followSound', + checkbox: true, + setValue: 'none', + text: { + head: '@@followSound@@', + desc: '', + checkbox: sound + } + } +] +var postConstruction = [ + { + id: 'cw-text', + storage: 'cw-text', + checkbox: false, + doubleText: false, + width: 150, + setValue: '', + text: { + head: '@@defaultcw@@', + desc: '', + after: '' + } + }, + { + checkbox: false, + doubleText: true, + data: [ + { + id: 'cw_sentence', + storage: 'cw_sentence', + width: 50, + setValue: 500, + text: { after: '@@lines@@ @@above@@ @@or@@' } + }, + { + id: 'cw_letters', + storage: 'cw_letters', + width: 50, + setValue: 7000, + text: { after: '@@letters@@ @@above@@' } + } + ], + text: { + head: '@@autocw@@', + desc: '@@autocwwarn@@' + } + }, + { + id: 'cws', + storage: 'always-cw', + checkbox: true, + setValue: 'no', + text: { + head: '@@cws@@', + desc: '', + checkbox: yesno + } + }, + { + id: 'vis', + storage: 'vis', + checkbox: true, + setValue: 'public', + text: { + head: '@@defaultvis@@', + desc: '', + checkbox: [ + { + text: '@@public@@', + value: 'public' + }, + { + text: '@@unlisted@@', + value: 'unlisted' + }, + { + text: '@@private@@', + value: 'private' + }, + { + text: '@@direct@@', + value: 'direct' + }, + { + text: '@@memory@@', + value: 'memory' + }, + { + text: '@@useapi@@', + value: 'useapi' + } + ] + } + }, + { + id: 'img', + storage: 'img', + checkbox: true, + setValue: 'no-act', + text: { + head: '@@postimg@@', + desc: '', + checkbox: [ + { + text: '@@showurl@@', + value: 'url' + }, + { + text: '@@nourl@@', + value: 'no-act' + } + ] + } + }, + { + id: 'box', + storage: 'box', + checkbox: true, + setValue: 'yes', + text: { + head: '@@box@@', + desc: '', + checkbox: [ + { + text: '@@boxyes@@', + value: 'yes' + }, + { + text: '@@boxno@@', + value: 'no' + }, + { + text: '@@boxabs@@', + value: 'absolute' + } + ] + } + }, + { + id: 'quote', + storage: 'quote', + checkbox: true, + setValue: 'nothing', + text: { + head: '@@quote@@', + desc: '', + checkbox: [ + { + text: '@@simple@@', + value: 'simple' + }, + { + text: '@@mention@@', + value: 'mention' + }, + { + text: '@@full@@', + value: 'full' + }, + { + text: '@@apiQuote@@', + value: 'apiQuote', + quote: true + }, + { + text: '@@notqt@@', + value: 'nothing' + } + ] + } + }, + { + id: 'main', + storage: 'mainuse', + checkbox: true, + setValue: 'remain', + text: { + head: '@@main@@', + desc: '@@mainwarn@@', + checkbox: [ + { + text: '@@lastacct@@', + value: 'remain' + }, + { + text: '@@usemainacct@@', + value: 'main' + } + ] + } + }, + { + id: 'sec', + storage: 'sec', + checkbox: true, + setValue: 'public', + text: { + head: '@@secondary@@', + desc: '', + checkbox: [ + { + text: '@@nothing@@', + value: 'nothing' + }, + { + text: '@@public@@', + value: 'public' + }, + { + text: '@@unlisted@@', + value: 'unlisted' + }, + { + text: '@@private@@', + value: 'private' + }, + { + text: '@@direct@@', + value: 'direct' + }, + { + text: '@@localonly@@', + value: 'local', + kirishima: true, + kirishimaText: '非対応インスタンスでは「未収載」になります。' + } + ] + } + }, + { + id: 'zero', + storage: 'emoji-zero-width', + checkbox: true, + setValue: 'normal', + setValue: 'no', + text: { + head: '@@zeroWidthEmoji@@', + desc: '', + checkbox: yesno + } + } ]