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

TheDesk Mio (15.9.1)

Browse Source
This commit is contained in:
cutls
2018-07-19 01:05:53 +09:00
parent f1fd3f0197
commit 29f3d3af58
36 changed files with 2779 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/js/tl/filter.js
View File

@@ -279,6 +279,9 @@ function getFilter(acct_id){
});
}
function getFilterType(json,type){
if(!json){
return [];
}
if(type=="local"){
type="public";
}else if(type=="list"){

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

@@ -186,7 +186,7 @@ function mixmore(tlid,type) {
todo("Integrated TL MoreLoading...(Local)");
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_"+ acct_id + "_at");
var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id");
var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id");
var start = "https://" + domain + "/api/v1/timelines/public?local=true&max_id="+sid;

5
app/js/tl/parse.js
View File

@@ -232,11 +232,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.account.acct +
")<br>";
var boostback = "shared";
var uniqueid=toot.id;
var toot = toot.reblog;
var dis_name=escapeHTML(toot.account.display_name);
if(toot.account.emojis){
var actemojick = toot.account.emojis[0];
}else{
var uniqueid=toot.id;
var actemojick=false;
}
//絵文字があれば
@@ -251,6 +253,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
});
}
} else {
var uniqueid=toot.id;
var notice = "";
var boostback = "";
//ユーザー強調
@@ -513,7 +516,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
}
templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
boostback + ' ' + fav_app + ' ' + rt_app + ' ' + pin_app +
' ' + hasmedia + '" toot-id="' + id + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
' ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
key].created_at, 'unix') + '" '+if_notf+' onmouseover="mov(\'' + toot.id + '\',\''+tlid+'\')" onmouseout="resetmv()">' +
'<div class="area-notice"><span class="gray sharesta">' + notice + home +
'</span></div>' +

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

@@ -89,7 +89,7 @@ function trendTag(){
Object.keys(json).forEach(function(tag) {
tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span> ';
});
$("#taglist").append('<span class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + tags+'</span>');
$("#taglist").append('<div class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + tags+'</div>');
trendintervalset()
}else{
$("#taglist").html("");

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

@@ -224,7 +224,7 @@ function moreload(type, tlid) {
}else if(type=="list"){
var data=obj[tlid].data;
}
var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id");
var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id");
if (localStorage.getItem("morelock") != sid) {
localStorage.setItem("morelock", sid);
if (type == "mix") {