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

Change: move user matching to More dropdown

Browse Source
This commit is contained in:
Cutls
2019-08-24 21:19:52 +09:00
parent 845c9a0f2e
commit 1b68cdf7db
10 changed files with 122 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -622,12 +622,17 @@ function showMat() {
var templete = "";
Object.keys(json).forEach(function (key) {
var user = json[key];
if (user.avatar) {
var avatar = user.avatar
} else {
var avatar = "../../img/loading.svg"
}
templete = templete +
'<div class="" style="padding-top:5px;">' +
'<div style="padding:0; margin:0; width:400px; max-width:100%; display:flex; align-items:flex-end;">' +
'<div style="flex-basis:40px;"><a onclick="udgEx(\'' + user.user + '\',' +
acct_id + ');" user="' + user.user + '" class="udg">' +
'<img src="' + user.avatar + '" width="40" class="prof-img" user="' + user.user + '"></a></div>' +
'<img src="' + avatar + '" width="40" class="prof-img" user="' + user.user + '"></a></div>' +
'<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"><big>' +
escapeHTML(user.screen_name) + '</big></div>' +
'<div class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"> @' +

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

@@ -79,8 +79,10 @@ function udg(user, acct_id) {
}
//moved設定時
if (json.moved) {
M.toast({ html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' +
json.moved.id + '\',\'' + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>', displayLength: 4000 })
M.toast({
html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' +
json.moved.id + '\',\'' + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>', displayLength: 4000
})
}
$('#his-data').modal('open');
$('#his-data').attr("user-id", user);
@@ -193,7 +195,7 @@ function udg(user, acct_id) {
$("#his-emp-btn").hide();
$(".only-my-data").show();
$(".only-his-data").hide();
if(localStorage.getItem("main")==acct_id){
if (localStorage.getItem("main") == acct_id) {
$("#his-main-acct").hide();
}
} else {
@@ -296,7 +298,7 @@ function misskeyUdg(user, acct_id) {
$("#his-emp-btn").hide();
$(".only-my-data").show();
$(".only-his-data").hide();
if(localStorage.getItem("main")==acct_id){
if (localStorage.getItem("main") == acct_id) {
$("#his-main-acct").hide();
}
} else {
@@ -403,8 +405,9 @@ function relations(user, acct_id) {
}
//Blocked
if (json.blocked_by) {
$("#his-float-timeline").hide();
$("#his-float-blocked").show();
$("#my-data-nav .btn").addClass("disabled")
$(".his-var-content").hide();
$("#his-float-blocked").show()
$("#his-follow-btn").hide()
}
@@ -430,6 +433,7 @@ function hisclose() {
function reset() {
$(".his-var-content:eq(0)").show();
$(".his-var-content:gt(0)").hide();
$("#my-data-nav .btn").removeClass("disabled")
$(".active-back").removeClass("active-back");
$(".column-first").addClass("active-back");
$("#his-name").text("Loading");
@@ -480,11 +484,11 @@ function reset() {
}
$('#my-data-nav .anc-link').on('click', function () {
var target = $(this).attr("go");
if(target){
if (target) {
$("#my-data-nav .anc-link").removeClass("active-back");
$(this).addClass("active-back");
$(target).show();
$(".his-var-content:not(" + target + ")").hide();
}
});