TheDesk Miria (17.0.1) beta4

app/js/login/login.js

@@ -40,15 +40,28 @@ function ck() {
 		}else{	
 		}
 	}
-	
-	if (at) {
+	var multi = localStorage.getItem("multi");
+	if (!multi) {
+		var obj = [];
+		var json = JSON.stringify(obj);
+		localStorage.setItem("multi", json);
+	} else {
+		var obj = JSON.parse(multi);
+	}
+	Object.keys(obj).forEach(function(key) {
+		var acct=obj[key];
+		if(acct.domain){
+			refresh(key,true)
+		}
+	});
+	console.log(obj);
+	if (obj[0].domain) {
 		$("#tl").show();
 		ticker();
-		parseColumn();
 		multiSelector();
 	} else {
 		$("#tl").show();
-		multiSelector();
+		$("#post-box").hide();
 	}
 }
 ck();
@@ -230,7 +243,7 @@ function getdataAdv(domain, at) {
 		var avatar=json["avatar"];
 		//missingがmissingなやつ
 		if(avatar=="/avatars/original/missing.png"){
-			avatar="./img/missing.svg";
+			avatar="../../img/missing.svg";
 		}
 		if(json["source"]["privacy"]){
 			var priv=json["source"]["privacy"];
@@ -261,7 +274,7 @@ function getdataAdv(domain, at) {
 	});
 }
 //ユーザーデータ更新
-function refresh(target) {
+function refresh(target,loadskip) {
 	var multi = localStorage.getItem("multi");
 	var obj = JSON.parse(multi);
 	if(obj[target].mode=="misskey"){
@@ -313,8 +326,9 @@ function refresh(target) {
 		obj[target] = ref;
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
-
-		load();
+		if(!loadskip){
+			load();
+		}
 	});
 }
 //MarkdownやBBCodeの対応、文字数制限をチェック
@@ -451,7 +465,8 @@ function multiSelector() {
 		var list = key * 1 + 1;
 		if (key == last) {
 			sel = "selected";
-			var domain = localStorage.getItem("domain_" + key);
+			var domain = acct.domain;
+			localStorage.setItem("domain_" + key, domain);
 			if(idata[domain+"_letters"]){
 				$("#textarea").attr("data-length", idata[domain+"_letters"])
 			}else{
@@ -465,13 +480,20 @@ function multiSelector() {
 			if(idata[domain+"_glitch"]){
 				$("#local-button").removeClass("hide")
 			}
-			var profimg=localStorage.getItem("prof_"+key);
+			var profimg = acct.prof;
+			localStorage.setItem("prof_" + key, profimg);
 			console.log(profimg);
 			if(!profimg){
-				profimg="./img/missing.svg";
+				profimg="../../img/missing.svg";
 			}
 			$("#acct-sel-prof").attr("src",profimg);
-			$("#toot-post-btn").text(lang.lang_toot+"("+domain+")");
+			console.log(domain);
+			if(domain){
+				var cc="("+domain+")";
+			}else{
+				var cc="";
+			}
+			$("#toot-post-btn").text(lang.lang_toot+cc);
 			if(acct.background && acct.background!="def" && acct.text && acct.text!="def"){
 				$("#toot-post-btn").removeClass("indigo");
 				$("#toot-post-btn").css("background-color","#"+acct.background);
@@ -501,6 +523,7 @@ function multiSelector() {
 		$("#add-acct-sel").append('<option value="noauth">'+lang.lang_login_noauth+'</option><option value="webview">Twitter</option>');
 	}
 	$('select').material_select('update');
+	parseColumn();
 }
 
 //バージョンエンコ

app/js/login/manager.js

@@ -82,7 +82,7 @@ function data(domain) {
 	$("#ins-user").text("Loading...");
 	$("#ins-ver").text("Loading...");
 	$("#ins-name").text("Loading...");
-	$("#ins-prof").attr('src', "./img/loading.svg");
+	$("#ins-prof").attr('src', "../../img/loading.svg");
 	var start = "https://instances.social/api/1.0/instances/show?name=" + domain;
 	fetch(start, {
 		method: 'GET',
@@ -175,6 +175,7 @@ function multiDel(target) {
 		console.log(obj);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
+		load();
 		//カラムデータコンフリクト
 		var col = localStorage.getItem("column");
 		var oldcols = JSON.parse(col);
@@ -199,7 +200,7 @@ function multiDel(target) {
 		});
 		var json = JSON.stringify(newcols);
 		localStorage.setItem("column", json);
-		load();
+		
 	}
 }
 function multiDel2(target) {
@@ -500,7 +501,7 @@ function getdata(domain, at) {
 		var avatar=json["avatar"];
 		//missingがmissingなやつ
 		if(avatar=="/avatars/original/missing.png"){
-			avatar="./img/missing.svg";
+			avatar="../../img/missing.svg";
 		}
 		if(json["source"]){
 			var priv=json["source"]["privacy"];
@@ -659,7 +660,7 @@ function multisel() {
 			var profimg=localStorage.getItem("prof_"+key);
 			var domain=localStorage.getItem("domain_"+key);
 			if(!profimg){
-				profimg="./img/missing.svg";
+				profimg="../../img/missing.svg";
 			}
 		} else {
 			sel = "";

app/js/post/bb-md.js

@@ -4,7 +4,7 @@ function mdCheck(){
 	var acct_id = $("#post-acct-sel").val();
 	var profimg=localStorage.getItem("prof_"+acct_id);
 	if(!profimg){
-		profimg="./img/missing.svg";
+		profimg="../../img/missing.svg";
 	}
 	$("#acct-sel-prof").attr("src",profimg);
 		if(localStorage.getItem("post_" + acct_id)){

app/js/post/use-txtbox.js

@@ -13,7 +13,7 @@ function re(id,at,acct_id,mode){
 	$("#textarea").focus();
 	var profimg=localStorage.getItem("prof_"+acct_id);
 	if(!profimg){
-		profimg="./img/missing.svg";
+		profimg="../../img/missing.svg";
 	}
 	$("#acct-sel-prof").attr("src",profimg);
 	vis(mode);

app/js/tl/parse.js

@@ -824,7 +824,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	if(toot.avatar){
 		var avatar=toot.avatar;
 	}else{
-		var avatar="./img/missing.svg";
+		var avatar="../../img/missing.svg";
 	}
 	
 		templete = templete +

app/js/ui/img.js

@@ -3,7 +3,7 @@
 function imgv(id, key, acct_id) {
 	$("#imgprog").text(0);
 	$('#imgmodal').hide();
-	$('#imgmodal').attr('src', './img/loading.svg');
+	$('#imgmodal').attr('src', '../../img/loading.svg');
 	var murl = $("#" + id + "-image-" + key).attr("data-url");
 	var type = $("#" + id + "-image-" + key).attr("data-type");
 	$("#imagemodal").attr("data-id",id);
@@ -128,7 +128,7 @@ function imgCont(type) {
 	}
 	var murl = $("#" + id + "-image-" + key).attr("data-url");
 	if(murl){
-	$('#imgmodal').attr('src', './img/loading.svg');
+	$('#imgmodal').attr('src', '../../img/loading.svg');
 	var type = $("#" + id + "-image-" + key).attr("data-type");
 	$(document).ready(function() {
 		if (type == "image") {

app/js/ui/layout.js

@@ -59,7 +59,6 @@ function parseColumn() {
 			domain: 0,
 			type: 'local'
 		}];
-		localStorage.setItem("card_0","true");
 		var json = JSON.stringify(obj);
 		localStorage.setItem("column", json);
 	} else {

app/js/userdata/showOnTL.js

@@ -410,8 +410,8 @@ function reset(){
 	$(".column-first").addClass("active-back");
 	$("#his-name").text("Loading");
 	$("#his-acct").text("");
-	$("#his-prof").attr("src", "./img/loading.svg");
-	$('#his-data').css('background-image', 'url(./img/loading.svg)');
+	$("#his-prof").attr("src", "../../img/loading.svg");
+	$('#his-data').css('background-image', 'url(../../img/loading.svg)');
 	$("#his-sta").text("");
 	$("#his-follow").text("");
 	$("#his-follower").text("");