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

#317 WebView prefer

Browse Source
This commit is contained in:
cutls 2020-08-05 12:46:10 +09:00
parent 31cc929c68
commit 2281d0ca35
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -652,7 +652,7 @@ function removeColumn(tlid) {
localStorage.setItem('column', json) localStorage.setItem('column', json)
sortLoad() sortLoad()
$('#timeline_box_' + tlid + '_box').remove() $('#timeline_box_' + tlid + '_box').remove()
if(!data.left_fold) { if (!data.left_fold) {
$('#timeline_box_' + tlid + '_parentBox').remove() $('#timeline_box_' + tlid + '_parentBox').remove()
} }
} }
@ -786,7 +786,8 @@ function webviewParse(url, key, insert, icnsert, css) {
<i class="fab fa-twitter waves-effect" id="notice_icon_${key}" style="font-size:40px; padding-top:25%;"></i> <i class="fab fa-twitter waves-effect" id="notice_icon_${key}" style="font-size:40px; padding-top:25%;"></i>
</div> </div>
<div class="area-notice_name tl-title">WebView('${url}')</div> <div class="area-notice_name tl-title">WebView('${url}')</div>
<div class="area-sta"></div> <div class="area-sta">
</div>
<div class="area-a2"> <div class="area-a2">
<a onclick="removeColumn('${key}')" class="setting nex"> <a onclick="removeColumn('${key}')" class="setting nex">
<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert}>cancel</i> <i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert}>cancel</i>
@ -829,7 +830,7 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
${lang.lang_layout_leftUnfold} ${lang.lang_layout_leftUnfold}
</span><br>` </span><br>`
} }
if(type == 'utl') { if (type == 'utl') {
var dataHtml = false var dataHtml = false
} else { } else {
var dataHtml = data var dataHtml = data
@ -899,13 +900,13 @@ function bookmark(key, data) {
tl('bookmark', '', data, key, 'false', voice, '') tl('bookmark', '', data, key, 'false', voice, '')
} }
function utl(key, acct_id, data) { function utl(key, acct_id, data) {
if(!data) { if (!data) {
var multi = localStorage.getItem('column') var multi = localStorage.getItem('column')
var obj = JSON.parse(multi) var obj = JSON.parse(multi)
data = obj[key].data data = obj[key].data
acct_id = obj[key].domain acct_id = obj[key].domain
} }
console.log(key, data) console.log(key, data)
if (localStorage.getItem('voice_' + key)) { if (localStorage.getItem('voice_' + key)) {
var voice = true var voice = true

2
app/view/make/language/en/index.json
View File

@ -130,7 +130,7 @@
"notf":"Notifications", "notf":"Notifications",
"bookmark": "Bookmarks", "bookmark": "Bookmarks",
"showThisTL":"Show this TL:", "showThisTL":"Show this TL:",
"webviewWarn":"TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.", "webviewWarn":"TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
"add":"Add", "add":"Add",
"search":"Search", "search":"Search",
"sortSet":"Sort", "sortSet":"Sort",

2
app/view/make/language/ja-KS/index.json
View File

@ -128,7 +128,7 @@
"notf":"通知", "notf":"通知",
"bookmark": "ブックマーク", "bookmark": "ブックマーク",
"showThisTL":"表示するタイムライン", "showThisTL":"表示するタイムライン",
"webviewWarn":"TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。キーボードショートカットと干渉しはるから、文字入れる時はカラムの「WebView優先」にチェック入れてからしてな。", "webviewWarn":"TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。",
"add":"追加", "add":"追加",
"search":"検索", "search":"検索",
"sortSet":"並べ替え設定", "sortSet":"並べ替え設定",

2
app/view/make/language/ja/index.json
View File

@ -130,7 +130,7 @@
"notf":"通知", "notf":"通知",
"bookmark": "ブックマーク", "bookmark": "ブックマーク",
"showThisTL":"表示するタイムライン", "showThisTL":"表示するタイムライン",
"webviewWarn":"TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。キーボードショートカットが邪魔をするので、文字入力時はカラムの「WebView優先」にチェックを入れてください。", "webviewWarn":"TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。",
"add":"追加", "add":"追加",
"search":"検索", "search":"検索",
"sortSet":"並べ替え設定", "sortSet":"並べ替え設定",