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

TheDesk Akane (16.0.5)

Browse Source
This commit is contained in:
cutls
2018-08-11 00:58:00 +09:00
parent d0061c5a95
commit c18af0042d
13 changed files with 235 additions and 1030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/js/lang/lang.js
View File

@@ -185,6 +185,11 @@ var lang_status_unemphas={
"ja":"を強調解除します。リロードしてください。",
"en":"'s toots are not emphasized. Please reload after this action."
}
//post/suggest.js
var lang_suggest_nodata={
"ja":"サジェストのために絵文字リストを取得してください。",
"en":"Please get emojis list in order to show suggestion."
}
//post/use-txtbox.js
var lang_usetxtbox_reply={
"ja":"返信モードです。クリアするときはCtrl+Shift+Cを押してください。",

3
app/js/post/post.js
View File

@@ -76,7 +76,8 @@ function post() {
var json = httpreq.response;
console.log(json);
var box = localStorage.getItem("box");
if (box == "yes") {
if (box == "yes" || !box) {
$("#textarea").blur();
hide();
}
$("#toot-post-btn").prop("disabled", false);

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

@@ -17,17 +17,22 @@ input.addEventListener("focus", function() {
var semoji = new_val.match(/:(\S{3,})/);
if(semoji){
var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
var num = obj.length;
var ehtml="";
for (i = 0; i < num; i++) {
var emoji = obj[i];
if ( ~emoji.shortcode.indexOf(semoji[1])) {
if (emoji) {
ehtml = ehtml+'<a onclick="emojiInsert(\':' + emoji.shortcode +
': \',\':'+semoji[1]+'\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
if(!obj){
var ehtml=lang_suggest_nodata[lang];
}else{
var num = obj.length;
var ehtml="";
for (i = 0; i < num; i++) {
var emoji = obj[i];
if ( ~emoji.shortcode.indexOf(semoji[1])) {
if (emoji) {
ehtml = ehtml+'<a onclick="emojiInsert(\':' + emoji.shortcode +
': \',\':'+semoji[1]+'\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
}
}
}
}
}
}
$("#suggest").html(ehtml);
}

2
app/js/tl/misskeyparse.js
View File

@@ -351,6 +351,8 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
if(dis_name){
dis_name=twemoji.parse(dis_name);
}else{
dis_name="";
}
if(spoil){
spoil=twemoji.parse(spoil);

6
app/js/tl/mix.js
View File

@@ -1,5 +1,5 @@
//Integrated TL
function mixtl(acct_id, tlid, type,delc) {
function mixtl(acct_id, tlid, type,delc,voice) {
console.log(delc);
localStorage.removeItem("morelock")
localStorage.setItem("now", type);
@@ -67,7 +67,7 @@ function mixtl(acct_id, tlid, type,delc) {
});
$("#timeline_" + tlid).html(templete);
mixre(acct_id, tlid, type, mute,delc);
mixre(acct_id, tlid, type, mute,delc,voice);
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
todc();
@@ -77,7 +77,7 @@ function mixtl(acct_id, tlid, type,delc) {
//Streamingに接続
function mixre(acct_id, tlid, TLtype, mute,delc) {
function mixre(acct_id, tlid, TLtype, mute,delc,voice) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_"+ acct_id + "_at");
var startHome = "wss://" + domain +

4
app/js/tl/tl.js
View File

@@ -308,10 +308,10 @@ function moreload(type, tlid) {
var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id");
if (localStorage.getItem("morelock") != sid) {
localStorage.setItem("morelock", sid);
if (type == "mix" && domain!="misskey.xyz") {
if (type == "mix" && localStorage.getItem("domain_" + acct_id)!="misskey.xyz") {
mixmore(tlid,"integrated");
return;
}else if (type == "plus" && domain!="misskey.xyz") {
}else if (type == "plus" && localStorage.getItem("domain_" + acct_id)!="misskey.xyz") {
mixmore(tlid,"plus");
return;
}else if (type == "notf") {

5
app/js/ui/layout.js
View File

@@ -72,8 +72,10 @@ function parseColumn() {
var acct = obj[key];
if(acct.type=="notf"){
var notf_attr=' data-notf='+acct.domain;
var if_notf="hide";
}else{
var notf_attr='';
var if_notf="";
}
if(localStorage.getItem("notification_" + acct.domain)){
var unique_notf=lang_layout_thisacct[lang].replace("{{notf}}" ,localStorage.getItem("notification_" + acct.domain));
@@ -108,12 +110,13 @@ function parseColumn() {
insert=insert+" border-bottom:medium solid #"+acctlist[acct.domain].background;
}
}
var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
'" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="goTop(' + key + ')" title="'+lang_layout_gotop[lang]+'"></i></div>'+
'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>'+
'<div class="area-a1"><a onclick="notfToggle(' + acct.domain + ',' + key +
')" class="setting nex" title="'+unique_notf+'"'+icnsert+'><i class="material-icons waves-effect nex notf-icon_' +
')" class="setting nex '+if_notf+'" title="'+unique_notf+'"'+icnsert+'><i class="material-icons waves-effect nex notf-icon_' +
acct.domain + '">notifications</i></div><div class="area-sta"><span class="new badge teal notf-reply_'+acct.domain+' hide" data-badge-caption="Reply">0</span><span class="new badge yellow black-text notf-fav_'+acct.domain+' hide" data-badge-caption="Fav">0</span><span class="new badge blue notf-bt_'+acct.domain+' hide" data-badge-caption="BT">0</span><span class="new badge orange notf-follow_'+acct.domain+' hide" data-badge-caption="Follow">0</span></a></div>'+
'<div class="area-a2"><a onclick="removeColumn(' + key +
')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang_layout_delthis[lang]+'"'+icnsert+'>cancel</i></a></div>'+