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

TheDesk Usamin (18.3.1)

Browse Source
This commit is contained in:
Cutls
2019-04-22 23:16:57 +09:00
parent 4fb37525d5
commit 823fae5eac
35 changed files with 161 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/js/post/emoji.js
View File

@@ -35,7 +35,7 @@ function emojiToggle(reaction) {
//絵文字リスト挿入
function emojiGet(parse, started) {
$('#emoji-list').html('Loading...');
$('#emoji-list').text('Loading...');
var acct_id = $("#post-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id);
if (localStorage.getItem("mode_" + domain) != "misskey") {
@@ -52,7 +52,7 @@ function emojiGet(parse, started) {
console.error(error);
}).then(function (json) {
if (parse == "true") {
$('#emoji-list').html('Parsing...');
$('#emoji-list').text('Parsing...');
//絵文字をマストドン公式と同順にソート
json.sort(function (a, b) {
if (a.shortcode < b.shortcode) return -1;
@@ -96,7 +96,7 @@ function emojiGet(parse, started) {
})
});
if (parse == "true") {
$('#emoji-list').html('Parsing...');
$('#emoji-list').text('Parsing...');
//絵文字をマストドン公式と同順にソート
md.sort(function (a, b) {
if (a.shortcode < b.shortcode) return -1;

2
app/js/post/misskeystatus.js
View File

@@ -234,7 +234,7 @@ function voterefresh(acct_id,id){
}else{
var myvote="";
}
poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+json.id+'\','+choice.id+')">'+choice.text+'('+choice.votes+''+myvote+')</div>';
poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+json.id+'\','+choice.id+')">'+escapeHTML(choice.text)+'('+choice.votes+''+myvote+')</div>';
});
$(".vote_"+json.id).html(poll)
}

2
app/js/post/post.js
View File

@@ -298,7 +298,7 @@ function clear() {
$("#post-acct-sel").prop("disabled", false);
$("#days_poll").val(0);
$("#hours_poll").val(0);
$("#mins_poll").val(0);
$("#mins_poll").val(6);
$(".mastodon-choice").map(function() {
$(this).val("");
});

2
app/js/post/suggest.js
View File

@@ -169,7 +169,7 @@ function cgNPs(q){
var tags = "";
Object.keys(json).forEach(function(key4) {
var tag = json[key4];
tags = tags + '<a onclick="cgNP(\''+json[key4]+'\')" class="pointer">' + json[key4] + '</a> ';
tags = tags + '<a onclick="cgNP(\''+json[key4]+'\')" class="pointer">' + escapeHTML(json[key4]) + '</a> ';
});
$("#suggest").html("Cinderella NowPlaying:" + tags);
}else{