From cec46faf19d243b50ed649d12b5f35da1c512bbf Mon Sep 17 00:00:00 2001 From: Cutls Date: Sun, 14 Apr 2019 01:42:18 +0900 Subject: [PATCH] keybase --- app/js/platform/end.js | 7 +++++-- app/js/platform/first.js | 7 +++++++ app/js/tl/card.js | 7 +++---- app/js/userdata/showOnTL.js | 8 ++++++++ app/view/en/index.html | 2 +- app/view/ja/index.html | 2 +- app/view/make/index.sample.html | 2 +- app/view/ps/index.html | 2 +- 8 files changed, 27 insertions(+), 10 deletions(-) diff --git a/app/js/platform/end.js b/app/js/platform/end.js index 9d18fe07..4e9adaf2 100644 --- a/app/js/platform/end.js +++ b/app/js/platform/end.js @@ -35,8 +35,11 @@ }else if(tags){ if(tags[2]){ - tagShow(tags[2]); - Materialize.toast('Open in browser', 86400); + var acct_id=$a.parent().attr("data-acct"); + if(!acct_id){ + acct_id=0; + } + tl('tag',decodeURI(tags[2]),acct_id,'add') } }else if(ats){ console.log(ats); diff --git a/app/js/platform/first.js b/app/js/platform/first.js index 255b6cfc..a95edd06 100644 --- a/app/js/platform/first.js +++ b/app/js/platform/first.js @@ -32,6 +32,13 @@ function nl2br(str) { str = str.replace(/(\n|\r)/g, "
"); return str; } +function br2nl(str) { + if(!str){ + return ""; + } + str = str.replace(/
/g, "\r\n"); + return str; +} function formattime(date){ var str=date.getFullYear()+"-"; if(date.getMonth()+1<10){ diff --git a/app/js/tl/card.js b/app/js/tl/card.js index d9e981f3..b6c1395e 100644 --- a/app/js/tl/card.js +++ b/app/js/tl/card.js @@ -4,9 +4,9 @@ function additional(acct_id, tlid) { //メンション系 //$(".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( /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{ + text="" var urls =[] } diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js index f0e0d929..b201b38b 100644 --- a/app/js/userdata/showOnTL.js +++ b/app/js/userdata/showOnTL.js @@ -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]; @@ -123,6 +124,12 @@ function udg(user, acct_id) { note = note.replace(regExp, emoji_url); }); } + //noteの解析 + //var tags = '#$1'; + //var mens = '@$1'; + //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-acct").text(json.acct); $("#his-acct").attr("fullname",fullname); @@ -164,6 +171,7 @@ function udg(user, acct_id) { if(json.bot){ $("#his-bot").html(lang.lang_showontl_botacct); } + $("#his-des").attr("data-acct",acct_id); $('#his-data').css('background-size', 'cover'); $("#his-data .tab-content").css("height",$("#his-float-timeline").height()-70+"px") localStorage.setItem("history" , user); diff --git a/app/view/en/index.html b/app/view/en/index.html index 223e785b..461fbac4 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -385,7 +385,7 @@ var tlid=0;
-

+

Emphasize this user Feature on profile
diff --git a/app/view/ja/index.html b/app/view/ja/index.html index d86b3089..243f55af 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -385,7 +385,7 @@ var tlid=0;
-

+

ユーザー強調 紹介する
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 08cee3cd..44901031 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -385,7 +385,7 @@ var tlid=0;
-

+

{{empUser}} {{endorse}}
diff --git a/app/view/ps/index.html b/app/view/ps/index.html index b4018420..05a2849a 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -385,7 +385,7 @@ var tlid=0;
-

+

crwdns472:0crwdne472:0 crwdns454:0crwdne454:0