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

tag bag/link to acct on users data.

Browse Source
This commit is contained in:
cutls 2018-09-14 01:40:51 +09:00
parent 9e05a1443a
commit 1b96b42356
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/css/userdata.css
View File

@ -85,3 +85,7 @@
.custom-tabs .custom-tab a{
padding: 8px 12px;
}
#his-des .mention{
color: #039be5;
cursor: pointer;
}

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="' +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> ';
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)+ '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang_parse_tagtoot[lang].replace("{{tag}}" ,'#'+tag) + '">Toot</a>　'+
'<a onclick="autoToot(\'#' + tag + ' \');brInsert(\'#' + tag + ' \')" class="pointer" title="'+lang_tags_always[lang] + lang_parse_tagtoot[lang].replace("{{tag}}" ,'#'+tag) + '">'+lang_tags_realtime[lang]+'</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' +lang_tags_tagunpin[lang].replace("{{tag}}" ,'#'+tag)+ '">'+lang_del[lang]+'</a></span> ';
});
if(obj.length>0){
$("#taglist").append("My Tags:" + tags);
@ -107,5 +107,5 @@ function tagTL(a,b,c,d){
}
function autoToot(tag){
localStorage.setItem("stable",tag);
Materialize.toast(lang_tags_tagwarn[lang].replace("{{tag}}" ,'#'+tag.name),3000);
Materialize.toast(lang_tags_tagwarn[lang].replace("{{tag}}" ,tag).replace("{{tag}}" ,tag),3000);
}

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

@ -105,6 +105,7 @@ function udg(user, acct_id) {
fer(json.id, '', acct_id);
var dis_name=escapeHTML(json.display_name);
dis_name=twemoji.parse(dis_name);
var note=json.note;
if(json.emojis){
var actemojick = json.emojis[0];
}else{
@ -119,6 +120,7 @@ function udg(user, acct_id) {
'" class="emoji-img" data-emoji="'+shortcode+'">';
var regExp = new RegExp(":" + shortcode + ":", "g");
dis_name = dis_name.replace(regExp, emoji_url);
note = note.replace(regExp, emoji_url);
});
}
$("#his-name").html(dis_name);
@ -131,10 +133,9 @@ function udg(user, acct_id) {
$("#his-follower").text(json.followers_count);
$("#his-since").text(crat(json.created_at));
$("#his-openin").attr("data-href", json.url);
var note=json.note;
if(json.fields){
if(json.fields.length>0){
var note=json.note+'<table id="his-field">'
note=note+'<table id="his-field">'
for(var i=0;i<json.fields.length;i++){
var fname=json.fields[i].name;
var fval=json.fields[i].value;