From 5c39443d926d38eacc0068a5f0955e6d5f1265aa Mon Sep 17 00:00:00 2001 From: cutls Date: Thu, 5 Jul 2018 10:26:07 +0900 Subject: [PATCH] Update for big supprise! --- app/js/login/login.js | 6 +++--- app/js/platform/end.js | 4 +++- app/js/post/img.js | 2 +- app/js/tl/parse.js | 4 ++-- app/js/tl/src.js | 2 +- app/js/ui/layout.js | 3 +++ app/js/ui/settings.js | 20 ++++++++++++++++++++ app/js/ui/theme.js | 6 ++++++ app/js/userdata/showOnTL.js | 9 +++++---- app/main.js | 2 +- app/setting.html | 5 +++++ 11 files changed, 50 insertions(+), 13 deletions(-) diff --git a/app/js/login/login.js b/app/js/login/login.js index a7fea708..377b6308 100644 --- a/app/js/login/login.js +++ b/app/js/login/login.js @@ -20,10 +20,8 @@ function ck() { var codex=m[2]; if(mode=="manager" || mode=="login"){ code(codex,mode); - }else{ - + }else{ } - } if (at) { @@ -272,6 +270,8 @@ function ckdb(acct_id) { localStorage.setItem("md_" + acct_id, "true"); $(".markdown").show(); }else{ + $(".anti-markdown").hide(); + $(".markdown").hide(); localStorage.removeItem("bb_" + acct_id); } if(json[domain + "_home"]){ diff --git a/app/js/platform/end.js b/app/js/platform/end.js index e7b3f334..40a2e86a 100644 --- a/app/js/platform/end.js +++ b/app/js/platform/end.js @@ -8,7 +8,7 @@ } var urls=[]; if(url){ - urls = url.match(/https?:\/\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/); + urls = url.match(/https?:\/\/(.+)/); //トゥートのURLぽかったら toot = url.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/); //タグのURLぽかったら @@ -46,8 +46,10 @@ tagShow(tags[2]); } }else if(ats){ + console.log(ats); if(ats[2]){ if(ats[1]!="quesdon.rinsuki.net"){ + udgEx(ats[2]+"@"+ats[1],"main"); return false }else{ const { diff --git a/app/js/post/img.js b/app/js/post/img.js index b9425627..684a1e1d 100644 --- a/app/js/post/img.js +++ b/app/js/post/img.js @@ -91,6 +91,7 @@ function media(b64, type, no) { $("#media").val("tmp_"+r); } $("#toot-post-btn").prop("disabled", true); + $("#post-acct-sel").prop("disabled", true); localStorage.setItem("image","busy"); todo("Image Upload..."); var media = toBlob(b64, type); @@ -133,7 +134,6 @@ function media(b64, type, no) { } todc(); $("#toot-post-btn").prop("disabled", false); - $("#post-acct-sel").prop("disabled", true); $('select').material_select(); $("#mec").text("あり"); Materialize.toast("ファイルアップロード後はアカウントを切り替えられません。", 1000); diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index c5b373d5..39e040ec 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -167,7 +167,7 @@ function parse(obj, mix, acct_id, tlid, popup) { datetype) + '' + dis_name + - "(" + toot.account.acct + + "(@" + toot.account.acct + ")"; var notice = noticetext; var memory = localStorage.getItem("notice-mem"); @@ -223,7 +223,7 @@ function parse(obj, mix, acct_id, tlid, popup) { }else if(localStorage.getItem("domain_" + acct_id)=="mstdn.osaka" && !locale){ rebtxt = "がしばいた"; } - var notice = ''+ dis_name + "(" + toot.account.acct + + var notice = ''+ dis_name + "(@" + toot.account.acct + ")
"; var boostback = "shared"; var toot = toot.reblog; diff --git a/app/js/tl/src.js b/app/js/tl/src.js index 44b71f73..d8ba9607 100644 --- a/app/js/tl/src.js +++ b/app/js/tl/src.js @@ -127,7 +127,7 @@ function trend(){ }).then(function(response) { return response.json(); }).catch(function(error) { - todo(error); + //todo(error); console.error(error); }).then(function(json) { var tags = ""; diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index 6cdcad2d..15d44db1 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -203,6 +203,9 @@ function removeColumn(tlid) { if(arg==1){ localStorage.removeItem("card_" + tlid); obj.splice(tlid, 1); + for(var i=0;i移行先を見る', 4000) } else { $('#his-data').modal('open'); @@ -118,6 +118,7 @@ function udg(user, acct_id) { $("#his-follow").text(json.following_count); $("#his-follower").text(json.followers_count); $("#his-since").text(crat(json.created_at)); + var note=json.note; if(json.fields){ if(json.fields.length>0){ var note=json.note+'My Fields
' @@ -128,12 +129,12 @@ function udg(user, acct_id) { note=note+''; } note=note+'
'+fname+''+fval+'
' - $("#his-des").html(note); + $("#his-des").html(twemoji.parse(note)); }else{ - $("#his-des").html(json.note); + $("#his-des").html(twemoji.parse(note)); } }else{ - $("#his-des").html(json.note); + $("#his-des").html(twemoji.parse(note)); } if(json.bot){ $("#his-bot").html("botアカウント"); diff --git a/app/main.js b/app/main.js index 73f77f93..0004ea75 100644 --- a/app/main.js +++ b/app/main.js @@ -431,7 +431,7 @@ ipc.on('column-del', (e, args) => { const options = { type: 'info', title: 'カラム削除', - message: "カラムを削除しますか？", + message: "カラムを削除しますか？(すべてのカラムのリンク解析がOFFになります。)", buttons: ['いいえ', 'はい'] } dialog.showMessageBox(options, function(index) { diff --git a/app/setting.html b/app/setting.html index b92989b4..2f3e1888 100644 --- a/app/setting.html +++ b/app/setting.html @@ -48,6 +48,11 @@ px以上
+
フォント
+ ローカルフォントを指定します。
+ + +
フォントサイズ
15px(絶対指定)