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

vis bug/setting bug

Browse Source
This commit is contained in:
Cutls 2019-03-19 00:24:46 +09:00
parent abee0bb901
commit f9e3b4129b
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ function loadVis(){
memory = "public"; memory = "public";
} }
vis(memory); vis(memory);
} else if(vist == "server") { } else if(vist == "useapi") {
var acct_id = $("#post-acct-sel").val(); var acct_id = $("#post-acct-sel").val();
var multi = localStorage.getItem("multi"); var multi = localStorage.getItem("multi");
var obj = JSON.parse(multi); var obj = JSON.parse(multi);

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

@ -54,8 +54,7 @@ function parseColumn() {
} }
var acctlist=obj; var acctlist=obj;
console.log(obj); console.log(obj);
/* /*var xed=localStorage.getItem("xed");
var xed=localStorage.getItem("xed");
if(xed){ if(xed){
xpand(); xpand();
}*/ }*/

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

@ -89,18 +89,24 @@ function load() {
var max=envView.config.length; var max=envView.config.length;
for(var i=0;i<max;i++){ for(var i=0;i<max;i++){
var ls=envView.config[i].storage; var ls=envView.config[i].storage;
if(localStorage.getItem(ls)){
envView.config[i].setValue=localStorage.getItem(ls) envView.config[i].setValue=localStorage.getItem(ls)
} }
}
var max=tlView.config.length; var max=tlView.config.length;
for(var i=0;i<max;i++){ for(var i=0;i<max;i++){
var ls=tlView.config[i].storage; var ls=tlView.config[i].storage;
if(localStorage.getItem(ls)){
tlView.config[i].setValue=localStorage.getItem(ls) tlView.config[i].setValue=localStorage.getItem(ls)
} }
}
var max=postView.config.length; var max=postView.config.length;
for(var i=0;i<max;i++){ for(var i=0;i<max;i++){
var ls=postView.config[i].storage; var ls=postView.config[i].storage;
if(localStorage.getItem(ls)){
postView.config[i].setValue=localStorage.getItem(ls) postView.config[i].setValue=localStorage.getItem(ls)
} }
}
if(localStorage.getItem("imas")){ if(localStorage.getItem("imas")){
$(".imas").removeClass("hide"); $(".imas").removeClass("hide");
} }

5
app/main.js
View File

@ -60,14 +60,15 @@ try {
try { try {
var lang = fs.readFileSync(lang_path, 'utf8'); var lang = fs.readFileSync(lang_path, 'utf8');
} catch (e) { } catch (e) {
var lang=app.getLocale(); var langs=app.getLocale();
if(~lang.indexOf("ja")){ if(~langs.indexOf("ja")){
lang="ja"; lang="ja";
}else{ }else{
lang="en"; lang="en";
} }
fs.writeFileSync(lang_path,lang); fs.writeFileSync(lang_path,lang);
} }
console.log(app.getLocale());
console.log("launch:"+lang); console.log("launch:"+lang);
// 全てのウィンドウが閉じたら終了 // 全てのウィンドウが閉じたら終了
app.on('window-all-closed', function() { app.on('window-all-closed', function() {

2
app/view/en/setting.vue.js
View File

@ -273,7 +273,7 @@ var tlConstruction=[
setValue:"no", setValue:"no",
text:{ text:{
head:"Enable #InstanceTicker", head:"Enable #InstanceTicker",
desc:'Show colorful stickers about tooters' server. <a href="https://cdn.weep.me/mastodon/">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.', desc:'Show colorful stickers about the server. <a href="https://cdn.weep.me/mastodon/">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.',
checkbox:yesno checkbox:yesno
} }
},{ },{

2
app/view/make/language/setting.en.json
View File

@ -82,7 +82,7 @@
"or":"or", "or":"or",
"imgheight":"Height of images", "imgheight":"Height of images",
"ticker":"Enable #InstanceTicker", "ticker":"Enable #InstanceTicker",
"tickerwarn":"Show colorful stickers about tooters' server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.", "tickerwarn":"Show colorful stickers about the server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
"animation":"Animation of timelines", "animation":"Animation of timelines",
"post":"Posting Preferences", "post":"Posting Preferences",
"autocw":"Alert before posting a long toot.", "autocw":"Alert before posting a long toot.",