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

TheDesk Akane (16.0.0) - phase:2.1

Browse Source
This commit is contained in:
cutls
2018-07-29 18:43:08 +09:00
parent f6f3525bc8
commit 7178c2d6c5
7 changed files with 127 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/js/tl/notification.js
View File

@@ -173,14 +173,14 @@ function notfToggle(acct, tlid) {
notfCanceler(acct)
}
function notfCanceler(acct){
$(".notf-reply_" + acct_id).text(0);
$(".notf-reply_" + acct_id).addClass("hide");
$(".notf-fav_" + acct_id).text(0);
$(".notf-fav_" + acct_id).addClass("hide");
$(".notf-bt_" + acct_id).text(0);
$(".notf-bt_" + acct_id).addClass("hide");
$(".notf-follow_" + acct_id).text(0);
$(".notf-follow_" + acct_id).addClass("hide");
$(".notf-reply_" + acct).text(0);
$(".notf-reply_" + acct).addClass("hide");
$(".notf-fav_" + acct).text(0);
$(".notf-fav_" + acct).addClass("hide");
$(".notf-bt_" + acct).text(0);
$(".notf-bt_" + acct).addClass("hide");
$(".notf-follow_" + acct).text(0);
$(".notf-follow_" + acct).addClass("hide");
$(".notf-icon_" + acct).removeClass("red-text");
}
function allNotfRead(){
@@ -199,9 +199,8 @@ function allNotfRead(){
} else {
var obj = JSON.parse(multi);
}
console.log(obj);
var templete;
Object.keys(obj).forEach(function(key) {
console.log(key);
notfCanceler(key)
});
}

6
app/js/tl/tag.js
View File

@@ -56,8 +56,8 @@ function favTag(){
var tags="";
Object.keys(obj).forEach(function(key) {
var tag = obj[key];
tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a>　'+
'<a onclick="autoToot(\'#' + tag + ' \');brInsert(\'#' + tag + ' \')" class="pointer" title="常に#' + tag + 'でトゥート">実況</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="#' + tag + 'をよく使うタグから削除">削除</a></span> ';
tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="' +lang_parse_tagTL[lang].replace("{{tag}}" ,'#'+tag.name)+ '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang_parse_tagtoot[lang].replace("{{tag}}" ,'#'+tag.name) + '">Toot</a>　'+
'<a onclick="autoToot(\'#' + tag + ' \');brInsert(\'#' + tag + ' \')" class="pointer" title="'+lang_tags_always[lang] + lang_parse_tagtoot[lang].replace("{{tag}}" ,'#'+tag.name) + '">'+lang_tags_realtime[lang]+'</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' +lang_tags_tagunpin[lang].replace("{{tag}}" ,'#'+tag.name)+ '">'+lang_del[lang]+'</a></span> ';
});
if(obj.length>0){
$("#taglist").append("My Tags:" + tags);
@@ -108,5 +108,5 @@ function tagTL(a,b,c,d){
}
function autoToot(tag){
localStorage.setItem("stable",tag);
Materialize.toast("次に"+tag+"なしでトゥートするまで全てのトゥートに"+tag+"が付与されます。",3000);
Materialize.toast(lang_tags_tagwarn[lang].replace("{{tag}}" ,'#'+tag.name),3000);
}

4
app/js/tl/tl.js
View File

@@ -331,7 +331,7 @@ function cap(type, data, acct_id) {
}
} else if (type == "local-media") {
if(localStorage.getItem("local_" + acct_id) && !locale){
var response=localStorage.getItem("local_" + acct_id)+"(メディア)";
var response=localStorage.getItem("local_" + acct_id)+"("+lang_tl_media[lang]+")";
}else{
var response="Local TL(Media)";
}
@@ -343,7 +343,7 @@ function cap(type, data, acct_id) {
}
} else if (type == "pub-media") {
if(localStorage.getItem("public_" + acct_id) && !locale){
var response=localStorage.getItem("public_" + acct_id)+"(メディア)";
var response=localStorage.getItem("public_" + acct_id)+"("+lang_tl_media[lang]+")";
}else{
var response="Federated TL(Media)";
}