From 990c2f796e6d40c8b2261f8ded83fda031dd47ea Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Mon, 20 May 2019 22:34:58 +0900
Subject: [PATCH] Fix acct-select-box

---
 app/js/login/login.js           |  8 ++++++--
 app/js/tl/parse.js              |  2 +-
 app/js/ui/layout.js             |  4 +++-
 app/view/make/index.sample.html | 11 +++--------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/js/login/login.js b/app/js/login/login.js
index e22c02e2..8379e79c 100644
--- a/app/js/login/login.js
+++ b/app/js/login/login.js
@@ -422,9 +422,13 @@ function multiSelector() {
 		var last = localStorage.getItem("main");
 	} else if (localStorage.getItem("last-use")) {
 		var last = localStorage.getItem("last-use");
+		if (last == "webview" || last == "noauth") {
+			last = "0";
+		}
 	} else {
-		var last = 0;
+		var last = "0";
 	}
+	last = last + "";
 	var sel;
 	if (obj.length < 1) {
 		$("#src-acct-sel").html('<option value="tootsearch">Tootsearch</option>');
@@ -433,7 +437,7 @@ function multiSelector() {
 		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key];
 			var list = key * 1 + 1;
-			if (key == last) {
+			if (key+"" === last) {
 				sel = "selected";
 				var domain = acct.domain;
 				localStorage.setItem("domain_" + key, domain);
diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js
index 33ec62de..1800c68d 100644
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -603,7 +603,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					}
 				} else {
 					if (media.type == "unknown") {
-						viewer = viewer + '<a href="' + media.remote_url + '">[' + lang.lang_parse_unknown + ']</a> '
+						viewer = viewer + '<a href="' + media.remote_url + '" title="' + media.remote_url + '">[' + lang.lang_parse_unknown + ']</a> '
 					} else {
 						viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
 							acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js
index be7507e8..5db36c4a 100644
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -304,7 +304,9 @@ function secvis(set) {
 //カラム追加
 function addColumn() {
 	var acct = $("#add-acct-sel").val();
-	localStorage.setItem("last-use", acct);
+	if(acct != "webview" && acct != "noauth"){
+		localStorage.setItem("last-use", acct);
+	}
 	var type = $("#type-sel").val();
 	if (acct == "noauth") {
 		acct = $("#noauth-url").val();
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index 53574d10..c70a73fc 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -675,18 +675,13 @@
 			<a href="https://thedesk.top" target="_blank">HP</a><br>
 			<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 			<br>
-			<div id="release-Usamin_18-4-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-4-1" class="release-do" style="display:none; ">
 				<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-				<h5>Release Note Usamin (18.4.0)</h5>
-				・ソフトウェア(通知音などのアセットを含むTheDeskオリジナル制作物)のコピーライトをTheDeskに統一。Cutls PをMain Developer(author)に。<br>
-				・Misskey v11のストリーミングに対応(初期取得の投稿のリアクションは自動取得できません。)<br>
-				・その他Misskeyのさまざまな挙動を修正、追加しました。<br>
-				・NSFWメディアが複数あったときに「NSFW Media」の文字が邪魔で複数段になる不具合を修正。<br>
-				・フォローリクエストの許可/拒否ができるように。<br>
-				・起動時に通知のストリーミングにつながらない不具合を修正<br>
+				<h5>Release Note Usamin (18.4.1)</h5>
+				・<br>
 				<br>
 				<h5>ThinkingDeskラベル</h5>
 				<img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br>