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

Update for big supprise!

Browse Source
This commit is contained in:
cutls 2018-07-05 10:26:07 +09:00
parent ca3aff674d
commit 5c39443d92
11 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/js/login/login.js
View File

@ -21,9 +21,7 @@ function ck() {
if(mode=="manager" || mode=="login"){
code(codex,mode);
}else{
}
}
if (at) {
@ -272,6 +270,8 @@ function ckdb(acct_id) {
localStorage.setItem("md_" + acct_id, "true");
$(".markdown").show();
}else{
$(".anti-markdown").hide();
$(".markdown").hide();
localStorage.removeItem("bb_" + acct_id);
}
if(json[domain + "_home"]){

4
app/js/platform/end.js
View File

@ -8,7 +8,7 @@
}
var urls=[];
if(url){
urls = url.match(/https?:\/\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/);
urls = url.match(/https?:\/\/(.+)/);
//トゥートのURLぽかったら
toot = url.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/);
//タグのURLぽかったら
@ -46,8 +46,10 @@
tagShow(tags[2]);
}
}else if(ats){
console.log(ats);
if(ats[2]){
if(ats[1]!="quesdon.rinsuki.net"){
udgEx(ats[2]+"@"+ats[1],"main");
return false
}else{
const {

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

@ -91,6 +91,7 @@ function media(b64, type, no) {
$("#media").val("tmp_"+r);
}
$("#toot-post-btn").prop("disabled", true);
$("#post-acct-sel").prop("disabled", true);
localStorage.setItem("image","busy");
todo("Image Upload...");
var media = toBlob(b64, type);
@ -133,7 +134,6 @@ function media(b64, type, no) {
}
todc();
$("#toot-post-btn").prop("disabled", false);
$("#post-acct-sel").prop("disabled", true);
$('select').material_select();
$("#mec").text("あり");
Materialize.toast("ファイルアップロード後はアカウントを切り替えられません。", 1000);

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

@ -167,7 +167,7 @@ function parse(obj, mix, acct_id, tlid, popup) {
datetype) +
'</span><i class="big-text fa '+icon+'"></i><a onclick="udg(\'' + toot.account.id +
'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
"(" + toot.account.acct +
"(@" + toot.account.acct +
")</a>";
var notice = noticetext;
var memory = localStorage.getItem("notice-mem");
@ -223,7 +223,7 @@ function parse(obj, mix, acct_id, tlid, popup) {
}else if(localStorage.getItem("domain_" + acct_id)=="mstdn.osaka" && !locale){
rebtxt = "がしばいた";
}
var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(" + toot.account.acct +
var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.account.acct +
")<br>";
var boostback = "shared";
var toot = toot.reblog;

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

@ -127,7 +127,7 @@ function trend(){
}).then(function(response) {
return response.json();
}).catch(function(error) {
todo(error);
//todo(error);
console.error(error);
}).then(function(json) {
var tags = "";

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

@ -203,6 +203,9 @@ function removeColumn(tlid) {
if(arg==1){
localStorage.removeItem("card_" + tlid);
obj.splice(tlid, 1);
for(var i=0;i<obj.length;i++){
localStorage.setItem("card_" + i,"true");
}
var json = JSON.stringify(obj);
localStorage.setItem("column", json);
parseColumn();

20
app/js/ui/settings.js
View File

@ -87,6 +87,20 @@ function settings() {
}
localStorage.setItem("img", imgd);
var fontd = $("#font").val();
if(fontd){
if (fontd != localStorage.getItem("font")) {
Materialize.toast("フォントを" + fontd + "に設定しました。", 3000);
}
localStorage.setItem("font", fontd);
themes();
}else{
localStorage.removeItem("font");
Materialize.toast("フォントをデフォルトに設定しました。", 3000);
themes();
}
var sized = $("#size").val();
if (sized != localStorage.getItem("size")) {
Materialize.toast("フォントサイズを" + sized + "pxに設定しました。", 3000);
@ -233,6 +247,12 @@ function load() {
}
$("#i_" + img).prop("checked", true);
var font = localStorage.getItem("font");
if (!font) {
var font = "";
}
$("#font").val(font);
var size = localStorage.getItem("size");
if (!size) {
var size = "13";

6
app/js/ui/theme.js
View File

@ -34,5 +34,11 @@ function themes(theme) {
$("html").removeClass("browntheme");
$("html").removeClass("blacktheme");
}
var font = localStorage.getItem("font");
if(font){
$("html").css("font-family",font);
}else{
$("html").css("font-family","");
}
}
themes();

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

@ -74,7 +74,7 @@ function udg(user, acct_id) {
//moved設定時
if (json.moved) {
Materialize.toast(
'このアカウントは移行します<button class="btn-flat toast-action" onclick="udg(\"' +
'このアカウントは移行しています<button class="btn-flat toast-action" onclick="udg(\"' +
json.moved + ','+acct_id+'\")">移行先を見る</button>', 4000)
} else {
$('#his-data').modal('open');
@ -118,6 +118,7 @@ function udg(user, acct_id) {
$("#his-follow").text(json.following_count);
$("#his-follower").text(json.followers_count);
$("#his-since").text(crat(json.created_at));
var note=json.note;
if(json.fields){
if(json.fields.length>0){
var note=json.note+'My Fields<br><table style="vertical-align: baseline; text-align:center; padding:0;">'
@ -128,12 +129,12 @@ function udg(user, acct_id) {
note=note+'<tr style="height:1.5rem; padding:0;"><td style="height:1.5rem; padding:0; background-color:#757575; text-align:center; ">'+fname+'</td><td style="height:1.5rem; padding:0; padding-left:5px;">'+fval+'</td></tr>';
}
note=note+'</table>'
$("#his-des").html(note);
$("#his-des").html(twemoji.parse(note));
}else{
$("#his-des").html(json.note);
$("#his-des").html(twemoji.parse(note));
}
}else{
$("#his-des").html(json.note);
$("#his-des").html(twemoji.parse(note));
}
if(json.bot){
$("#his-bot").html("botアカウント");

2
app/main.js
View File

@ -431,7 +431,7 @@ ipc.on('column-del', (e, args) => {
const options = {
type: 'info',
title: 'カラム削除',
message: "カラムを削除しますか？",
message: "カラムを削除しますか？(すべてのカラムのリンク解析がOFFになります。)",
buttons: ['いいえ', 'はい']
}
dialog.showMessageBox(options, function(index) {

5
app/setting.html
View File

@ -48,6 +48,11 @@
<input type="text" style="width:50px" id="width">px以上
<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
<br>
<h5>フォント</h5>
ローカルフォントを指定します。<br>
<input type="text" style="width:150px" id="font">
<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
<br>
<h5>フォントサイズ</h5>
<span style="font-size:15px">15px(絶対指定)</span>
<br>