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

Merge pull request #56 from cutls/mac

Browse Source 
miss
This commit is contained in:
Cutls 2019-04-14 01:43:57 +09:00 committed by GitHub
commit d1968a2e69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 155 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,6 +141,7 @@ var lang={
"lang_hisdata_frcwarn":"Unfollow accounts will be shown.", "lang_hisdata_frcwarn":"Unfollow accounts will be shown.",
"lang_hisdata_taketime":"It will take 30s ~ several minutes", "lang_hisdata_taketime":"It will take 30s ~ several minutes",
"lang_hisdata_notonmisskey":"Misskey is unable to request.", "lang_hisdata_notonmisskey":"Misskey is unable to request.",
"lang_hisdata_key":"This user is proofed by {{set}}",
//userdata/showOnTL.js //userdata/showOnTL.js
"lang_showontl_movetxt":"This account was moved", "lang_showontl_movetxt":"This account was moved",
"lang_showontl_movebtn":"Continue on the new account", "lang_showontl_movebtn":"Continue on the new account",

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

@ -143,6 +143,7 @@ var lang={
"lang_hisdata_frcwarn":"非フォローだけど絡みがある時に表示されます。", "lang_hisdata_frcwarn":"非フォローだけど絡みがある時に表示されます。",
"lang_hisdata_taketime":"30秒から数分かかります", "lang_hisdata_taketime":"30秒から数分かかります",
"lang_hisdata_notonmisskey":"このシステムはMisskeyにはありません。", "lang_hisdata_notonmisskey":"このシステムはMisskeyにはありません。",
"lang_hisdata_key":"このユーザーの信頼性は{{set}}によって示されています",
//userdata/showOnTL.js //userdata/showOnTL.js
"lang_showontl_movetxt":"このアカウントは移行しています", "lang_showontl_movetxt":"このアカウントは移行しています",
"lang_showontl_movebtn":"移行先を見る", "lang_showontl_movebtn":"移行先を見る",

7
app/js/platform/end.js
View File

@ -35,8 +35,11 @@
}else if(tags){ }else if(tags){
if(tags[2]){ if(tags[2]){
tagShow(tags[2]); var acct_id=$a.parent().attr("data-acct");
Materialize.toast('<a class="btn-flat toast-action" href="detEx(\''+url+'\')">Open in browser</a>', 86400); if(!acct_id){
acct_id=0;
}
tl('tag',decodeURI(tags[2]),acct_id,'add')
} }
}else if(ats){ }else if(ats){
console.log(ats); console.log(ats);

7
app/js/platform/first.js
View File

@ -32,6 +32,13 @@ function nl2br(str) {
str = str.replace(/(\n|\r)/g, "<br />"); str = str.replace(/(\n|\r)/g, "<br />");
return str; return str;
} }
function br2nl(str) {
if(!str){
return "";
}
str = str.replace(/<br \/>/g, "\r\n");
return str;
}
function formattime(date){ function formattime(date){
var str=date.getFullYear()+"-"; var str=date.getFullYear()+"-";
if(date.getMonth()+1<10){ if(date.getMonth()+1<10){

7
app/js/tl/card.js
View File

@ -4,9 +4,9 @@ function additional(acct_id, tlid) {
//メンション系 //メンション系
//$(".mention").attr("href", ""); //$(".mention").attr("href", "");
$(".mention").addClass("parsed"); $("#timeline-container .mention").addClass("parsed");
$(".hashtag").each(function(i, elem) { $("#timeline-container .hashtag").each(function(i, elem) {
var tags = $(this).attr("href").match( var tags = $(this).attr("href").match(
/https?:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/ /https?:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
); );
@ -17,8 +17,6 @@ function additional(acct_id, tlid) {
} }
} }
}); });
//トゥートサムネ //トゥートサムネ
@ -34,6 +32,7 @@ function additional(acct_id, tlid) {
); );
} }
}else{ }else{
text=""
var urls =[] var urls =[]
} }

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

@ -243,7 +243,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
var id = toot.id; var id = toot.id;
var home = ""; var home = "";
if (toot.account.locked) { if (toot.account.locked) {
var locked = ' <i class="fa fa-lock red-text"></i>'; var locked = ' <i class="fas fa-lock red-text"></i>';
} else { } else {
var locked = ""; var locked = "";
} }
@ -506,7 +506,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
toot.account.acct + locked + '</span></div>' + toot.account.acct + locked + '</span></div>' +
'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' + '<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' +
toot.url + '\');" title="' + date(toot.created_at, 'absolute') + toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' + '('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock-o"></i>' +
date(toot.created_at, datetype) + '</span>' + date(toot.created_at, datetype) + '</span>' +
'</div></div>' + '</div></div>' +
'<div class="area-toot">'+tickerdom+'<span class="' + '<div class="area-toot">'+tickerdom+'<span class="' +

26
app/js/tl/misskeyparse.js
View File

@ -182,14 +182,14 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
'"></a>'; '"></a>';
if (toot.type == "reply") { if (toot.type == "reply") {
var what = lang.lang_parse_mentioned; var what = lang.lang_parse_mentioned;
var icon = '<i class="big-text fa fa-share teal-text"></i>'; var icon = '<i class="big-text fas fa-share teal-text"></i>';
noticeavatar=""; noticeavatar="";
} else if (toot.type == "renote") { } else if (toot.type == "renote") {
var what = lang.lang_misskeyparse_renoted; var what = lang.lang_misskeyparse_renoted;
var icon = '<i class="big-text fa fa-retweet light-blue-text"></i>'; var icon = '<i class="big-text fas fa-retweet light-blue-text"></i>';
} else if (toot.type == "quote") { } else if (toot.type == "quote") {
var what = lang.lang_misskeyparse_quoted; var what = lang.lang_misskeyparse_quoted;
var icon = '<i class="big-text fa fa-quote-right orange-text"></i>'; var icon = '<i class="big-text fas fa-quote-right orange-text"></i>';
} else if (toot.type == "reaction") { } else if (toot.type == "reaction") {
var what = lang.lang_misskeyparse_reacted; var what = lang.lang_misskeyparse_reacted;
var reactions={ var reactions={
@ -224,7 +224,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
var icon = '<i class="big-text material-icons indigo-text" style="font-size:17px">info</i>'; var icon = '<i class="big-text material-icons indigo-text" style="font-size:17px">info</i>';
} }
var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.createdAt, var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.createdAt,
'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt, 'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.createdAt,
datetype) + datetype) +
'</span>'+icon+'<a onclick="udg(\'' + toot.user.username + '</span>'+icon+'<a onclick="udg(\'' + toot.user.username +
'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name + '\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
@ -290,7 +290,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
if (toot.renote) { if (toot.renote) {
var rebtxt = lang.lang_parse_btedsimple; var rebtxt = lang.lang_parse_btedsimple;
var rticon = "fa-retweet light-blue-text"; var rticon = "fa-retweet light-blue-text";
var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.user.username + var notice = '<i class="big-text fas '+rticon+'"></i>'+ dis_name + "(@" + toot.user.username +
")<br>"; ")<br>";
var boostback = "shared"; var boostback = "shared";
var uniqueid=toot.id; var uniqueid=toot.id;
@ -777,7 +777,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
toot.user.username + '</span></div>' + toot.user.username + '</span></div>' +
'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'https://' +domain+"/notes/"+ '<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'https://' +domain+"/notes/"+
toot.id + '\');" title="' + date(toot.createdAt, 'absolute') + toot.id + '\');" title="' + date(toot.createdAt, 'absolute') +
'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' + '('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock"></i>' +
date(toot.createdAt, datetype) + '</span>' + date(toot.createdAt, datetype) + '</span>' +
'</div></div>' + '</div></div>' +
'<div class="area-toot">'+tickerdom+'<span class="toot ' + spoiler + '">' + content + '<div class="area-toot">'+tickerdom+'<span class="toot ' + spoiler + '">' + content +
@ -814,23 +814,23 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="misskeyreply(\'' + toot.id + '<div class="action '+disp["re"]+' '+noauth+'"><a onclick="misskeyreply(\'' + toot.id +
'\',\'' + acct_id + '\',' + '\',\'' + acct_id + '\',' +
acct_id + ',\''+visen+ acct_id + ',\''+visen+
'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i></a></div>' + '\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fas fa-share"></i></a></div>' +
'<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="renote(\'' + toot.id + '\',' + acct_id + '<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="renote(\'' + toot.id + '\',' + acct_id +
',\'' + tlid + ',\'' + tlid +
'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renote+'"><i class="text-darken-3 fa fa-retweet ' + '\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renote+'"><i class="text-darken-3 fas fa-retweet ' +
if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct"></span></a></div>' + if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct"></span></a></div>' +
'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+'"><a onclick="renoteqt(\'' + toot.id + '\',' + acct_id + '<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+'"><a onclick="renoteqt(\'' + toot.id + '\',' + acct_id +
',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renoteqt+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' + ',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renoteqt+'"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
'<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="reactiontoggle(\'' + toot.id + '\',' + acct_id + '<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="reactiontoggle(\'' + toot.id + '\',' + acct_id +
',\'' + tlid + ',\'' + tlid +
'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_reaction+'"><i class="fa text-darken-3 fa-plus' + '\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_reaction+'"><i class="fas text-darken-3 fa-plus' +
if_fav + ' fav_' + toot.id + '"></i></div>' + if_fav + ' fav_' + toot.id + '"></i></div>' +
'<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' + '<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' +
acct_id + acct_id +
')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fa fa-trash-o"></i></a></div>' + ')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fas fa-trash"></i></a></div>' +
'<div class="' + if_mine + ' action pin '+disp["pin"]+' '+noauth+'"><a onclick="pin(\'' + toot.id + '\',' + '<div class="' + if_mine + ' action pin '+disp["pin"]+' '+noauth+'"><a onclick="pin(\'' + toot.id + '\',' +
acct_id + acct_id +
')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fa fa-map-pin pin_' + toot.id + '"></i></a></div>' ')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fas fa-map-pin pin_' + toot.id + '"></i></a></div>'
+'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' + +'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' +
acct_id + acct_id +
')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+ ')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+
@ -867,7 +867,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
var ftxt=lang.lang_parse_followed; var ftxt=lang.lang_parse_followed;
if(popup > 0 || popup==-1){ if(popup > 0 || popup==-1){
var notftext='<span class="cbadge"title="' + date(toot.createdAt, var notftext='<span class="cbadge"title="' + date(toot.createdAt,
'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt, 'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.createdAt,
datetype) + datetype) +
'</span>'+ftxt+'<br>'; '</span>'+ftxt+'<br>';
var toot = toot.user; var toot = toot.user;

26
app/js/tl/parse.js
View File

@ -236,9 +236,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
var icon = "fa-tasks purple-text"; var icon = "fa-tasks purple-text";
} }
var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.created_at, var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.created_at,
'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at, 'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.created_at,
datetype) + datetype) +
'</span><i class="big-text fa '+icon+'"></i><a onclick="udg(\'' + toot.account.id + '</span><i class="big-text fas '+icon+'"></i><a onclick="udg(\'' + toot.account.id +
'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name + '\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
"(@" + toot.account.acct + "(@" + toot.account.acct +
")</a>"; ")</a>";
@ -334,7 +334,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
}else if(localStorage.getItem("domain_" + acct_id)=="mstdn.osaka" && !locale){ }else if(localStorage.getItem("domain_" + acct_id)=="mstdn.osaka" && !locale){
rebtxt = "がしばいた"; rebtxt = "がしばいた";
} }
var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.account.acct + var notice = '<i class="big-text fas '+rticon+'"></i>'+ dis_name + "(@" + toot.account.acct +
")<br>"; ")<br>";
var boostback = "shared"; var boostback = "shared";
var uniqueid=toot.id; var uniqueid=toot.id;
@ -387,7 +387,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
var divider = '<div class="divider"></div>'; var divider = '<div class="divider"></div>';
} }
if (toot.account.locked) { if (toot.account.locked) {
var locked = ' <i class="fa fa-lock red-text"></i>'; var locked = ' <i class="fas fa-lock red-text"></i>';
} else { } else {
var locked = ""; var locked = "";
} }
@ -735,7 +735,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
poll=poll+'<div class="'+voteclass+' vote vote_'+acct_id+'_'+toot.poll.id+'_'+keyc+'" onclick="'+votesel+'">'+escapeHTML(choice.title)+'<span class="vote_'+acct_id+'_'+toot.poll.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>'; poll=poll+'<div class="'+voteclass+' vote vote_'+acct_id+'_'+toot.poll.id+'_'+keyc+'" onclick="'+votesel+'">'+escapeHTML(choice.title)+'<span class="vote_'+acct_id+'_'+toot.poll.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
}); });
poll='<div class="vote_'+acct_id+'_'+toot.poll.id+'">'+poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') + poll='<div class="vote_'+acct_id+'_'+toot.poll.id+'">'+poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
'"><i class="fa fa-calendar-times-o"></i>' + '"><i class="far fa-calendar-times"></i>' +
ended+ '</span></div>'; ended+ '</span></div>';
} }
templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' + templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
@ -755,7 +755,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
toot.account.acct + locked + '</span></div>' + toot.account.acct + locked + '</span></div>' +
'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' + '<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' +
toot.url + '\');" title="' + date(toot.created_at, 'absolute') + toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' + '('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock"></i>' +
date(toot.created_at, datetype) + '</span>' + date(toot.created_at, datetype) + '</span>' +
'</div></div>' + '</div></div>' +
'<div class="area-toot">'+tickerdom+'<span class="' + '<div class="area-toot">'+tickerdom+'<span class="' +
@ -774,27 +774,27 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="re(\'' + toot.id + '<div class="action '+disp["re"]+' '+noauth+'"><a onclick="re(\'' + toot.id +
'\',\'' + to_mention + '\',' + '\',\'' + to_mention + '\',' +
acct_id + ',\''+visen+ acct_id + ',\''+visen+
'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i><span class="rep_ct">' + replyct + '\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fas fa-share"></i><span class="rep_ct">' + replyct +
'</a></span></a></div>' + '</a></span></a></div>' +
'<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="rt(\'' + toot.id + '\',' + acct_id + '<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="rt(\'' + toot.id + '\',' + acct_id +
',\'' + tlid + ',\'' + tlid +
'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="fa fa-retweet ' + '\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="fas fa-retweet ' +
if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct">' + toot.reblogs_count + if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct">' + toot.reblogs_count +
'</span></a></div>' + '</span></a></div>' +
'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+' '+qtClass+'"><a onclick="qt(\'' + toot.id + '\',' + acct_id + '<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+' '+qtClass+'"><a onclick="qt(\'' + toot.id + '\',' + acct_id +
',\'' + toot.account.acct +'\',\''+toot.url+ ',\'' + toot.account.acct +'\',\''+toot.url+
'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' + '\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
'<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="fav(\'' + toot.id + '\',' + acct_id + '<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="fav(\'' + toot.id + '\',' + acct_id +
',\'' + tlid + ',\'' + tlid +
'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fa text-darken-3 fa-star' + '\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fas text-darken-3 fa-star' +
if_fav + ' fav_' + toot.id + '"></i><span class="fav_ct">' + toot.favourites_count + if_fav + ' fav_' + toot.id + '"></i><span class="fav_ct">' + toot.favourites_count +
'</a></span></div>' + '</a></span></div>' +
'<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' + '<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' +
acct_id + acct_id +
')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fa fa-trash-o"></i></a></div>' + ')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="far fa-trash"></i></a></div>' +
'<div class="' + if_mine + ' action pin '+disp["pin"]+' '+noauth+'"><a onclick="pin(\'' + toot.id + '\',' + '<div class="' + if_mine + ' action pin '+disp["pin"]+' '+noauth+'"><a onclick="pin(\'' + toot.id + '\',' +
acct_id + acct_id +
')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fa fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>' ')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fas fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>'
+'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' + +'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' +
acct_id + acct_id +
')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+ ')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+
@ -833,7 +833,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
var notf=false; var notf=false;
} }
if (toot.locked) { if (toot.locked) {
var locked = ' <i class="fa fa-lock red-text"></i>'; var locked = ' <i class="fas fa-lock red-text"></i>';
} else { } else {
var locked = ""; var locked = "";
} }

2
app/js/tl/poll.js
View File

@ -111,7 +111,7 @@ function voteMastodonrefresh(acct_id,id){
poll=poll+'<div class="pointer vote vote_'+acct_id+'_'+json.id+'_'+keyc+'" onclick="'+votesel+'">'+choice.title+'<span class="vote_'+acct_id+'_'+json.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>'; poll=poll+'<div class="pointer vote vote_'+acct_id+'_'+json.id+'_'+keyc+'" onclick="'+votesel+'">'+choice.title+'<span class="vote_'+acct_id+'_'+json.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
}); });
poll=poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') + poll=poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') +
'"><i class="fa fa-calendar-times-o"></i>' + '"><i class="far fa-calendar-times"></i>' +
date(json.expires_at, datetype) + '</span>'; date(json.expires_at, datetype) + '</span>';
$('.vote_'+acct_id+'_'+json.id).html(poll) $('.vote_'+acct_id+'_'+json.id).html(poll)
} }

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

@ -153,15 +153,15 @@ function parseColumn() {
var animecss=""; var animecss="";
} }
if(acct.type=="notf"){ if(acct.type=="notf"){
var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fa fa-share exc-icons"></i></label> '+ var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fas fa-share exc-icons"></i></label> '+
'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'" '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fa fa-star exc-icons"></i></label> '+ '<input type="checkbox" class="filled-in" id="exc-fav-'+key+'" '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fas fa-star exc-icons"></i></label> '+
'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fa fa-retweet exc-icons"></i></label> '+ '<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fas fa-retweet exc-icons"></i></label> '+
'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fa fa-users exc-icons"></i></label> '+ '<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fas fa-users exc-icons"></i></label> '+
'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"poll")+' /><label for="exc-poll-'+key+'" class="exc-chb" ><i class="fa fa-tasks exc-icons"></i></label> '+ '<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"poll")+' /><label for="exc-poll-'+key+'" class="exc-chb" ><i class="fas fa-tasks exc-icons"></i></label> '+
'<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('+key+')">Filter</button><br>'; '<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('+key+')">Filter</button><br>';
}else if(acct.type=="home"){ }else if(acct.type=="home"){
var exclude='<a onclick="ebtToggle(' + key + var exclude='<a onclick="ebtToggle(' + key +
')" class="setting nex"><i class="fa fa-retweet waves-effect nex" title="'+lang.lang_layout_excludingbt +'" style="font-size:24px"></i><span id="sta-bt-' + ')" class="setting nex"><i class="fas fa-retweet waves-effect nex" title="'+lang.lang_layout_excludingbt +'" style="font-size:24px"></i><span id="sta-bt-' +
key + '">Off</span></a>'+lang.lang_layout_excludingbt+'<br>'; key + '">Off</span></a>'+lang.lang_layout_excludingbt+'<br>';
}else{ }else{
var exclude=""; var exclude="";
@ -445,7 +445,7 @@ function coloradd(key,bg,txt){
function webviewParse(url,key,insert,icnsert,css){ function webviewParse(url,key,insert,icnsert,css){
var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key + var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
'" style="'+css+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+ '" style="'+css+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
'<div class="area-notice"><i class="fa fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>'+ '<div class="area-notice"><i class="fab fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></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"><input type="checkbox" id="webviewsel" value="true" class="filled-in"><label for="webviewsel">'+lang.lang_layout_webviewmode +'</label></div>'+ '<div class="area-sta"><input type="checkbox" id="webviewsel" value="true" class="filled-in"><label for="webviewsel">'+lang.lang_layout_webviewmode +'</label></div>'+
'<div class="area-a2"><a onclick="removeColumn(' + key + '<div class="area-a2"><a onclick="removeColumn(' + key +

30
app/js/userdata/his-data.js
View File

@ -553,6 +553,36 @@ function showFrl(more, acct_id) {
}); });
} }
//Keybase
function udAdd(start) {
fetch(start, {
method: 'GET',
headers: {
'Accept': 'application/json'
},
//body: JSON.stringify({})
}).then(function(response) {
return response.json();
}).catch(function(error) {
todo(error);
console.error(error);
}).then(function(json) {
var fields=json.attachment;
for(var i=0;i<fields.length;i++){
if(fields[i].type=="IdentityProof"){
if(fields[i].signatureAlgorithm=="keybase"){
var html='<a href="https://keybase.io/'+fields[i].name+'" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",fields[i].signatureAlgorithm)+'"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</a>';
}else{
var html='<span class="cbadge teal" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",fields[i].signatureAlgorithm)+'"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</span>';
}
$("#his-proof-prof").append(html)
}
}
});
}
//ユーザーマッチングリスト //ユーザーマッチングリスト
function showMat() { function showMat() {

11
app/js/userdata/showOnTL.js
View File

@ -105,6 +105,7 @@ function udg(user, acct_id) {
fer(json.id, '', acct_id); fer(json.id, '', acct_id);
var dis_name=escapeHTML(json.display_name); var dis_name=escapeHTML(json.display_name);
dis_name=twemoji.parse(dis_name); dis_name=twemoji.parse(dis_name);
var note=json.note; var note=json.note;
if(json.emojis){ if(json.emojis){
var actemojick = json.emojis[0]; var actemojick = json.emojis[0];
@ -123,6 +124,12 @@ function udg(user, acct_id) {
note = note.replace(regExp, emoji_url); note = note.replace(regExp, emoji_url);
}); });
} }
//noteの解析
//var tags = '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
//var mens = '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
//note=note.replace(/#(\S+)/gi, tags)
console.log(note)
//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
$("#his-name").html(dis_name); $("#his-name").html(dis_name);
$("#his-acct").text(json.acct); $("#his-acct").text(json.acct);
$("#his-acct").attr("fullname",fullname); $("#his-acct").attr("fullname",fullname);
@ -164,6 +171,7 @@ function udg(user, acct_id) {
if(json.bot){ if(json.bot){
$("#his-bot").html(lang.lang_showontl_botacct); $("#his-bot").html(lang.lang_showontl_botacct);
} }
$("#his-des").attr("data-acct",acct_id);
$('#his-data').css('background-size', 'cover'); $('#his-data').css('background-size', 'cover');
$("#his-data .tab-content").css("height",$("#his-float-timeline").height()-70+"px") $("#his-data .tab-content").css("height",$("#his-float-timeline").height()-70+"px")
localStorage.setItem("history" , user); localStorage.setItem("history" , user);
@ -200,6 +208,8 @@ function udg(user, acct_id) {
$(".only-his-data").show(); $(".only-his-data").show();
} }
todc(); todc();
//外部データ取得(死かもしれないので)
udAdd(json.url);
}); });
} }
function misskeyUdg(user, acct_id) { function misskeyUdg(user, acct_id) {
@ -468,6 +478,7 @@ function reset(){
$("#his-openin").attr("data-href", ""); $("#his-openin").attr("data-href", "");
$("#his-float-timeline").show(); $("#his-float-timeline").show();
$("#his-float-blocked").hide(); $("#his-float-blocked").hide();
$("#his-proof-prof").html("")
} }
$('#my-data-nav .custom-tab').on('click',function(){ $('#my-data-nav .custom-tab').on('click',function(){
var target=$(this).find("a").attr("go"); var target=$(this).find("a").attr("go");

3
app/package.json
View File

@ -1,7 +1,8 @@
{ {
"name": "thedesk", "name": "thedesk",
"version": "18.2.1", "version": "18.2.2",
"description": "TheDesk is a Mastodon client for PC.", "description": "TheDesk is a Mastodon client for PC.",
"repository": "https://github.com/cutls/TheDesk",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",

29
app/view/en/index.html
View File

@ -4,13 +4,13 @@
<title>TheDesk</title> <title>TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport"> <meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="../../css/materialize.css" type="text/css" rel="stylesheet"> <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
<link href="../../css/themes.css" type="text/css" rel="stylesheet"> <link href="../../css/themes.css" type="text/css" rel="stylesheet">
<link href='../../css/tl.css' rel='stylesheet' type='text/css'> <link href="../../css/tl.css" rel="stylesheet" type="text/css">
<link href='../../css/userdata.css' rel='stylesheet' type='text/css'> <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
<link href='../../css/post.css' rel='stylesheet' type='text/css'> <link href="../../css/post.css" rel="stylesheet" type="text/css">
<link href="../../css/master.css" type="text/css" rel="stylesheet"> <link href="../../css/master.css" type="text/css" rel="stylesheet">
<link href='../../css/sort.css' rel='stylesheet' type='text/css'> <link href="../../css/sort.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
<meta charset="utf-8"> <meta charset="utf-8">
<!-- <!--
@ -32,7 +32,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver="Usamin (18.2.1)"; var ver="Usamin (18.2.2)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -249,7 +249,7 @@ var tlid=0;
<i class="material-icons">flag</i> <i class="material-icons">flag</i>
</a> </a>
<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn"> <a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
<i class="fa fa-fort-awesome"></i> <i class="fab fa-fort-awesome"></i>
</a> </a>
</div> </div>
</div> </div>
@ -324,26 +324,26 @@ var tlid=0;
</li> </li>
<li class="dm-hide"> <li class="dm-hide">
<div class="collapsible-header"> <div class="collapsible-header">
<i class="text-darken-3 fa fa-retweet"></i>People who boosted it <i class="text-darken-3 false fas fa-retweet"></i>People who boosted it
</div> </div>
<div class="collapsible-body toot-reset" id="toot-rt"> <div class="collapsible-body toot-reset" id="toot-rt">
</div> </div>
</li> </li>
</ul> </ul>
<div class="dm-hide"> <div class="dm-hide">
Use other account(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>:unfav and unBT are disabled.)<br> Use other account(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>:unfav and unBT are disabled.)<br>
<div class="row"> <div class="row">
<div class="col s6"> <div class="col s6">
<select id="status-acct-sel" class="acct-sel"></select> <select id="status-acct-sel" class="acct-sel"></select>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button> <button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button> <button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button> <button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
</div> </div>
</div> </div>
<div id="toot-tools"> <div id="toot-tools">
@ -383,8 +383,9 @@ var tlid=0;
<span class="cbadge" style="max-width:150px; width:150px; ">Since: <span class="cbadge" style="max-width:150px; width:150px; ">Since:
<span id="his-since"></span> <span id="his-since"></span>
</span> </span>
<div id="his-proof-prof"></div>
</div> </div>
<div id="his-des"></div><br> <div id="his-des" data-acct=""></div><br>
<div id="his-plus-action"> <div id="his-plus-action">
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">Emphasize this user</a> <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">Emphasize this user</a>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">Feature on profile</a><br> <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">Feature on profile</a><br>
@ -829,7 +830,7 @@ var tlid=0;
<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i> <i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
</a> </a>
<a onclick="tips('spotify')" class="nex waves-effect"> <a onclick="tips('spotify')" class="nex waves-effect">
<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i> <i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
</a> </a>
</div> </div>
</div> </div>

29
app/view/ja/index.html
View File

@ -4,13 +4,13 @@
<title>TheDesk</title> <title>TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport"> <meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="../../css/materialize.css" type="text/css" rel="stylesheet"> <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
<link href="../../css/themes.css" type="text/css" rel="stylesheet"> <link href="../../css/themes.css" type="text/css" rel="stylesheet">
<link href='../../css/tl.css' rel='stylesheet' type='text/css'> <link href="../../css/tl.css" rel="stylesheet" type="text/css">
<link href='../../css/userdata.css' rel='stylesheet' type='text/css'> <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
<link href='../../css/post.css' rel='stylesheet' type='text/css'> <link href="../../css/post.css" rel="stylesheet" type="text/css">
<link href="../../css/master.css" type="text/css" rel="stylesheet"> <link href="../../css/master.css" type="text/css" rel="stylesheet">
<link href='../../css/sort.css' rel='stylesheet' type='text/css'> <link href="../../css/sort.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
<meta charset="utf-8"> <meta charset="utf-8">
<!-- <!--
@ -32,7 +32,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver="Usamin (18.2.1)"; var ver="Usamin (18.2.2)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -249,7 +249,7 @@ var tlid=0;
<i class="material-icons">flag</i> <i class="material-icons">flag</i>
</a> </a>
<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn"> <a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
<i class="fa fa-fort-awesome"></i> <i class="fab fa-fort-awesome"></i>
</a> </a>
</div> </div>
</div> </div>
@ -324,26 +324,26 @@ var tlid=0;
</li> </li>
<li class="dm-hide"> <li class="dm-hide">
<div class="collapsible-header"> <div class="collapsible-header">
<i class="text-darken-3 fa fa-retweet"></i>このトゥートをブーストした人 <i class="text-darken-3 false fas fa-retweet"></i>このトゥートをブーストした人
</div> </div>
<div class="collapsible-body toot-reset" id="toot-rt"> <div class="collapsible-body toot-reset" id="toot-rt">
</div> </div>
</li> </li>
</ul> </ul>
<div class="dm-hide"> <div class="dm-hide">
他のアカウントを使用(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>の解除はできません)<br> 他のアカウントを使用(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>の解除はできません)<br>
<div class="row"> <div class="row">
<div class="col s6"> <div class="col s6">
<select id="status-acct-sel" class="acct-sel"></select> <select id="status-acct-sel" class="acct-sel"></select>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button> <button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button> <button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button> <button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
</div> </div>
</div> </div>
<div id="toot-tools"> <div id="toot-tools">
@ -383,8 +383,9 @@ var tlid=0;
<span class="cbadge" style="max-width:150px; width:150px; ">Since: <span class="cbadge" style="max-width:150px; width:150px; ">Since:
<span id="his-since"></span> <span id="his-since"></span>
</span> </span>
<div id="his-proof-prof"></div>
</div> </div>
<div id="his-des"></div><br> <div id="his-des" data-acct=""></div><br>
<div id="his-plus-action"> <div id="his-plus-action">
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">ユーザー強調</a> <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">ユーザー強調</a>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">紹介する</a><br> <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">紹介する</a><br>
@ -829,7 +830,7 @@ var tlid=0;
<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i> <i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
</a> </a>
<a onclick="tips('spotify')" class="nex waves-effect"> <a onclick="tips('spotify')" class="nex waves-effect">
<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i> <i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
</a> </a>
</div> </div>
</div> </div>

27
app/view/make/index.sample.html
View File

@ -4,13 +4,13 @@
<title>TheDesk</title> <title>TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport"> <meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="../../css/materialize.css" type="text/css" rel="stylesheet"> <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
<link href="../../css/themes.css" type="text/css" rel="stylesheet"> <link href="../../css/themes.css" type="text/css" rel="stylesheet">
<link href='../../css/tl.css' rel='stylesheet' type='text/css'> <link href="../../css/tl.css" rel="stylesheet" type="text/css">
<link href='../../css/userdata.css' rel='stylesheet' type='text/css'> <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
<link href='../../css/post.css' rel='stylesheet' type='text/css'> <link href="../../css/post.css" rel="stylesheet" type="text/css">
<link href="../../css/master.css" type="text/css" rel="stylesheet"> <link href="../../css/master.css" type="text/css" rel="stylesheet">
<link href='../../css/sort.css' rel='stylesheet' type='text/css'> <link href="../../css/sort.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
<meta charset="utf-8"> <meta charset="utf-8">
{{comment-start}} {{comment-start}}
@ -249,7 +249,7 @@ var tlid=0;
<i class="material-icons">flag</i> <i class="material-icons">flag</i>
</a> </a>
<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn"> <a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
<i class="fa fa-fort-awesome"></i> <i class="fab fa-fort-awesome"></i>
</a> </a>
</div> </div>
</div> </div>
@ -324,26 +324,26 @@ var tlid=0;
</li> </li>
<li class="dm-hide"> <li class="dm-hide">
<div class="collapsible-header"> <div class="collapsible-header">
<i class="text-darken-3 fa fa-retweet"></i>{{btedPeople}} <i class="text-darken-3 false fas fa-retweet"></i>{{btedPeople}}
</div> </div>
<div class="collapsible-body toot-reset" id="toot-rt"> <div class="collapsible-body toot-reset" id="toot-rt">
</div> </div>
</li> </li>
</ul> </ul>
<div class="dm-hide"> <div class="dm-hide">
{{useOtherAcct1}}(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>{{useOtherAcct2}})<br> {{useOtherAcct1}}(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>{{useOtherAcct2}})<br>
<div class="row"> <div class="row">
<div class="col s6"> <div class="col s6">
<select id="status-acct-sel" class="acct-sel"></select> <select id="status-acct-sel" class="acct-sel"></select>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button> <button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button> <button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button> <button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
</div> </div>
</div> </div>
<div id="toot-tools"> <div id="toot-tools">
@ -383,8 +383,9 @@ var tlid=0;
<span class="cbadge" style="max-width:150px; width:150px; ">Since: <span class="cbadge" style="max-width:150px; width:150px; ">Since:
<span id="his-since"></span> <span id="his-since"></span>
</span> </span>
<div id="his-proof-prof"></div>
</div> </div>
<div id="his-des"></div><br> <div id="his-des" data-acct=""></div><br>
<div id="his-plus-action"> <div id="his-plus-action">
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">{{empUser}}</a> <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">{{empUser}}</a>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">{{endorse}}</a><br> <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">{{endorse}}</a><br>
@ -829,7 +830,7 @@ var tlid=0;
<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i> <i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
</a> </a>
<a onclick="tips('spotify')" class="nex waves-effect"> <a onclick="tips('spotify')" class="nex waves-effect">
<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i> <i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
</a> </a>
</div> </div>
</div> </div>

29
app/view/ps/index.html
View File

@ -4,13 +4,13 @@
<title>TheDesk</title> <title>TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport"> <meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="../../css/materialize.css" type="text/css" rel="stylesheet"> <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
<link href="../../css/themes.css" type="text/css" rel="stylesheet"> <link href="../../css/themes.css" type="text/css" rel="stylesheet">
<link href='../../css/tl.css' rel='stylesheet' type='text/css'> <link href="../../css/tl.css" rel="stylesheet" type="text/css">
<link href='../../css/userdata.css' rel='stylesheet' type='text/css'> <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
<link href='../../css/post.css' rel='stylesheet' type='text/css'> <link href="../../css/post.css" rel="stylesheet" type="text/css">
<link href="../../css/master.css" type="text/css" rel="stylesheet"> <link href="../../css/master.css" type="text/css" rel="stylesheet">
<link href='../../css/sort.css' rel='stylesheet' type='text/css'> <link href="../../css/sort.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
<meta charset="utf-8"> <meta charset="utf-8">
@ -32,7 +32,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver="Usamin (18.2.1)"; var ver="Usamin (18.2.2)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -249,7 +249,7 @@ var tlid=0;
<i class="material-icons">flag</i> <i class="material-icons">flag</i>
</a> </a>
<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn"> <a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
<i class="fa fa-fort-awesome"></i> <i class="fab fa-fort-awesome"></i>
</a> </a>
</div> </div>
</div> </div>
@ -324,26 +324,26 @@ var tlid=0;
</li> </li>
<li class="dm-hide"> <li class="dm-hide">
<div class="collapsible-header"> <div class="collapsible-header">
<i class="text-darken-3 fa fa-retweet"></i>crwdns429:0crwdne429:0 <i class="text-darken-3 false fas fa-retweet"></i>crwdns429:0crwdne429:0
</div> </div>
<div class="collapsible-body toot-reset" id="toot-rt"> <div class="collapsible-body toot-reset" id="toot-rt">
</div> </div>
</li> </li>
</ul> </ul>
<div class="dm-hide"> <div class="dm-hide">
crwdns430:0crwdne430:0(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>crwdns431:0crwdne431:0)<br> crwdns430:0crwdne430:0(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>crwdns431:0crwdne431:0)<br>
<div class="row"> <div class="row">
<div class="col s6"> <div class="col s6">
<select id="status-acct-sel" class="acct-sel"></select> <select id="status-acct-sel" class="acct-sel"></select>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button> <button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button> <button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button> <button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
</div> </div>
</div> </div>
<div id="toot-tools"> <div id="toot-tools">
@ -383,8 +383,9 @@ var tlid=0;
<span class="cbadge" style="max-width:150px; width:150px; ">Since: <span class="cbadge" style="max-width:150px; width:150px; ">Since:
<span id="his-since"></span> <span id="his-since"></span>
</span> </span>
<div id="his-proof-prof"></div>
</div> </div>
<div id="his-des"></div><br> <div id="his-des" data-acct=""></div><br>
<div id="his-plus-action"> <div id="his-plus-action">
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">crwdns472:0crwdne472:0</a> <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">crwdns472:0crwdne472:0</a>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">crwdns454:0crwdne454:0</a><br> <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">crwdns454:0crwdne454:0</a><br>
@ -829,7 +830,7 @@ var tlid=0;
<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i> <i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
</a> </a>
<a onclick="tips('spotify')" class="nex waves-effect"> <a onclick="tips('spotify')" class="nex waves-effect">
<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i> <i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
</a> </a>
</div> </div>
</div> </div>