Add: set main account on showOnTL

This commit is contained in:
Cutls 2019-07-06 23:16:41 +09:00
parent 8e70e005c1
commit 0e9bdef9ca
8 changed files with 32 additions and 7 deletions

View File

@ -40,7 +40,7 @@ function ck() {
if (obj[0].domain) { if (obj[0].domain) {
$("#tl").show(); $("#tl").show();
ticker(); ticker();
multiSelector(); multiSelector(false);
verck(ver); verck(ver);
$("#something-wrong img").attr("src", "../../img/thinkingdesk.png") $("#something-wrong img").attr("src", "../../img/thinkingdesk.png")
} }
@ -403,7 +403,7 @@ function ckdb(acct_id) {
} }
//アカウントを選択…を実装 //アカウントを選択…を実装
function multiSelector() { function multiSelector(parseC) {
var multi = localStorage.getItem("multi"); var multi = localStorage.getItem("multi");
if (!multi) { if (!multi) {
var obj = []; var obj = [];
@ -490,7 +490,9 @@ function multiSelector() {
$("#add-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option><option value="webview">Twitter</option>'); $("#add-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option><option value="webview">Twitter</option>');
} }
$('select').formSelect(); $('select').formSelect();
parseColumn(true); if(!parseC){
parseColumn(true);
}
} }
//バージョンエンコ //バージョンエンコ

View File

@ -193,6 +193,9 @@ function udg(user, acct_id) {
$("#his-emp-btn").hide(); $("#his-emp-btn").hide();
$(".only-my-data").show(); $(".only-my-data").show();
$(".only-his-data").hide(); $(".only-his-data").hide();
if(localStorage.getItem("main")==acct_id){
$("#his-main-acct").hide();
}
} else { } else {
relations(user, acct_id); relations(user, acct_id);
$(".only-my-data").hide(); $(".only-my-data").hide();
@ -293,6 +296,9 @@ function misskeyUdg(user, acct_id) {
$("#his-emp-btn").hide(); $("#his-emp-btn").hide();
$(".only-my-data").show(); $(".only-my-data").show();
$(".only-his-data").hide(); $(".only-his-data").hide();
if(localStorage.getItem("main")==acct_id){
$("#his-main-acct").hide();
}
} else { } else {
if (json.isFollowing) { if (json.isFollowing) {
//自分がフォローしている //自分がフォローしている
@ -409,6 +415,12 @@ function profbrws() {
var url = $("#his-openin").attr("data-href") var url = $("#his-openin").attr("data-href")
postMessage(["openUrl", url], "*") postMessage(["openUrl", url], "*")
} }
function setMain() {
var acct_id = $("#his-data").attr("use-acct")
localStorage.setItem("main", acct_id);
multiSelector(true)
M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
}
//オールリセット //オールリセット
function hisclose() { function hisclose() {
$('#his-data').modal('close'); $('#his-data').modal('close');
@ -464,6 +476,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-main-acct").show();
$("#his-proof-prof").html("") $("#his-proof-prof").html("")
} }
$('#my-data-nav .tab').on('click', function () { $('#my-data-nav .tab').on('click', function () {

View File

@ -465,7 +465,9 @@
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" <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> id="his-end-btn" onclick="pinUser()">Feature on profile</a><br>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin" <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin"
onclick="profbrws()">Open in browser</a><br> onclick="profbrws()">Open in browser</a>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data" id="his-main-acct"
onclick="setMain()" style="width: calc(100% - 10px)">Set it an main account</a><br>
</div><br> </div><br>
<div id="his-matching-list"> <div id="his-matching-list">
Get people resembling this user.<br> Get people resembling this user.<br>

View File

@ -465,7 +465,9 @@
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data"
id="his-end-btn" onclick="pinUser()">紹介する</a><br> id="his-end-btn" onclick="pinUser()">紹介する</a><br>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin" <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin"
onclick="profbrws()">ブラウザで開く</a><br> onclick="profbrws()">ブラウザで開く</a>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data" id="his-main-acct"
onclick="setMain()" style="width: calc(100% - 10px)">メインアカウントに設定</a><br>
</div><br> </div><br>
<div id="his-matching-list"> <div id="his-matching-list">
似ているユーザーを取得できます。<br> 似ているユーザーを取得できます。<br>

View File

@ -465,7 +465,9 @@
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data"
id="his-end-btn" onclick="pinUser()">@@endorse@@</a><br> id="his-end-btn" onclick="pinUser()">@@endorse@@</a><br>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin" <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin"
onclick="profbrws()">@@openinbrowser@@</a><br> onclick="profbrws()">@@openinbrowser@@</a>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data" id="his-main-acct"
onclick="setMain()" style="width: calc(100% - 10px)">@@mainacct@@</a><br>
</div><br> </div><br>
<div id="his-matching-list"> <div id="his-matching-list">
@@likeUserDes@@<br> @@likeUserDes@@<br>

View File

@ -88,6 +88,7 @@
"likeHimOrHer":"Resembling", "likeHimOrHer":"Resembling",
"endorse":"Feature on profile", "endorse":"Feature on profile",
"openinbrowser":"Open in browser", "openinbrowser":"Open in browser",
"mainacct":"Set it an main account",
"frc":"Suggest", "frc":"Suggest",
"more":"More", "more":"More",
"revoverJP":" to ", "revoverJP":" to ",

View File

@ -89,6 +89,7 @@
"more":"もっと", "more":"もっと",
"endorse":"紹介する", "endorse":"紹介する",
"openinbrowser":"ブラウザで開く", "openinbrowser":"ブラウザで開く",
"mainacct":"メインアカウントに設定",
"revoverJP":"する", "revoverJP":"する",
"warnUseOtherAcct":"(解除はできません。)", "warnUseOtherAcct":"(解除はできません。)",
"revoverJPde":"で", "revoverJPde":"で",

View File

@ -465,7 +465,9 @@
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" <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> id="his-end-btn" onclick="pinUser()">crwdns454:0crwdne454:0</a><br>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin" <a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin"
onclick="profbrws()">crwdns455:0crwdne455:0</a><br> onclick="profbrws()">crwdns455:0crwdne455:0</a>
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data" id="his-main-acct"
onclick="setMain()" style="width: calc(100% - 10px)">@@mainacct@@</a><br>
</div><br> </div><br>
<div id="his-matching-list"> <div id="his-matching-list">
crwdns469:0crwdne469:0<br> crwdns469:0crwdne469:0<br>