From 2b84a27cdc33608d5712845aaa1ac057e5ae490c Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Sun, 1 Sep 2019 21:27:18 +0900
Subject: [PATCH] TheDesk Usain (18.9.2)

---
 app/js/post/emoji.js            | 28 ++++++++++++----------
 app/js/post/suggest.js          | 42 ++++++++++++++++++++++-----------
 app/js/tl/poll.js               | 12 ++++++----
 app/js/ui/post-box.js           |  7 ++++--
 app/package.json                |  2 +-
 app/view/make/index.sample.html | 10 ++++----
 app/view/make/make.js           |  2 +-
 7 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/app/js/post/emoji.js b/app/js/post/emoji.js
index 0ff2b131..3f9ecd58 100644
--- a/app/js/post/emoji.js
+++ b/app/js/post/emoji.js
@@ -14,12 +14,14 @@ function emojiToggle(reaction) {
 		$("#emoji").removeClass("hide")
 		$("#right-side").show()
 		$("#right-side").css("width", "300px")
-		$("#left-side").css("width","calc(100% - 300px)")
-		var width = localStorage.getItem("postbox-width").replace("px", "") * 1 + 300;
-        if (!width) {
-            width = 600
-        }
-        $("#post-box").css("width", width + "px")
+		$("#left-side").css("width", "calc(100% - 300px)")
+		var width = localStorage.getItem("postbox-width");
+		if (width) {
+			width = width.replace("px", "") * 1 + 300
+		} else {
+			width = 600
+		}
+		$("#post-box").css("width", width + "px")
 		$("#suggest").html("");
 		if (!localStorage.getItem("emoji_" + acct_id)) {
 			var html =
@@ -34,12 +36,14 @@ function emojiToggle(reaction) {
 		$("#right-side").css("width", "300px")
 		$("#emoji").addClass("hide")
 		$("#suggest").html("");
-		$("#left-side").css("width","100%")
-		var width = localStorage.getItem("postbox-width").replace("px", "") * 1;
-        if (!width) {
-            width = 300
-        }
-        $("#post-box").css("width", width + "px")
+		$("#left-side").css("width", "100%")
+		var width = localStorage.getItem("postbox-width");
+		if (width) {
+			width = width.replace("px", "") * 1
+		} else {
+			width = 300
+		}
+		$("#post-box").css("width", width + "px")
 	}
 
 
diff --git a/app/js/post/suggest.js b/app/js/post/suggest.js
index 3b407b7a..b8f97405 100644
--- a/app/js/post/suggest.js
+++ b/app/js/post/suggest.js
@@ -20,8 +20,10 @@ input.addEventListener("focus", function () {
 				$("#right-side").hide()
 				$("#right-side").css("width", "300px")
 				$("#left-side").css("width", "100%")
-				var width = localStorage.getItem("postbox-width").replace("px", "") * 1;
-				if (!width) {
+				var width = localStorage.getItem("postbox-width");
+				if (width) {
+					width = width.replace("px", "") * 1
+				} else {
 					width = 300
 				}
 				$("#post-box").css("width", width + "px")
@@ -51,8 +53,10 @@ input.addEventListener("focus", function () {
 					$("#right-side").show()
 					$("#right-side").css("width", "200px")
 					$("#left-side").css("width", "calc(100% - 200px)")
-					var width = localStorage.getItem("postbox-width").replace("px", "") * 1 + 200;
-					if (!width) {
+					var width = localStorage.getItem("postbox-width");
+					if (width) {
+						width = width.replace("px", "") * 1 + 200
+					} else {
 						width = 600
 					}
 					$("#post-box").css("width", width + "px")
@@ -63,8 +67,10 @@ input.addEventListener("focus", function () {
 						$("#right-side").hide()
 						$("#right-side").css("width", "300px")
 						$("#left-side").css("width", "100%")
-						var width = localStorage.getItem("postbox-width").replace("px", "") * 1;
-						if (!width) {
+						var width = localStorage.getItem("postbox-width");
+						if (width) {
+							width = width.replace("px", "") * 1
+						} else {
 							width = 300
 						}
 						$("#post-box").css("width", width + "px")
@@ -85,8 +91,10 @@ input.addEventListener("focus", function () {
 					$("#right-side").hide()
 					$("#right-side").css("width", "300px")
 					$("#left-side").css("width", "100%")
-					var width = localStorage.getItem("postbox-width").replace("px", "") * 1;
-					if (!width) {
+					var width = localStorage.getItem("postbox-width");
+					if (width) {
+						width = width.replace("px", "") * 1
+					} else {
 						width = 300
 					}
 					$("#post-box").css("width", width + "px")
@@ -149,8 +157,10 @@ input.addEventListener("focus", function () {
 							$("#right-side").show()
 							$("#right-side").css("width", "200px")
 							$("#left-side").css("width", "calc(100% - 200px)")
-							var width = localStorage.getItem("postbox-width").replace("px", "") * 1 + 200;
-							if (!width) {
+							var width = localStorage.getItem("postbox-width");
+							if (width) {
+								width = width.replace("px", "") * 1 + 200
+							} else {
 								width = 600
 							}
 							$("#post-box").css("width", width + "px")
@@ -172,8 +182,10 @@ input.addEventListener("focus", function () {
 						$("#right-side").show()
 						$("#right-side").css("width", "200px")
 						$("#left-side").css("width", "calc(100% - 200px)")
-						var width = localStorage.getItem("postbox-width").replace("px", "") * 1 + 200;
-						if (!width) {
+						var width = localStorage.getItem("postbox-width");
+						if (width) {
+							width = width.replace("px", "") * 1 + 200
+						} else {
 							width = 600
 						}
 						$("#post-box").css("width", width + "px")
@@ -185,8 +197,10 @@ input.addEventListener("focus", function () {
 							$("#right-side").hide()
 							$("#right-side").css("width", "300px")
 							$("#left-side").css("width", "100%")
-							var width = localStorage.getItem("postbox-width").replace("px", "") * 1;
-							if (!width) {
+							var width = localStorage.getItem("postbox-width");
+							if (width) {
+								width = width.replace("px", "") * 1
+							} else {
 								width = 300
 							}
 							$("#post-box").css("width", width + "px")
diff --git a/app/js/tl/poll.js b/app/js/tl/poll.js
index eaa6270c..a9e67235 100644
--- a/app/js/tl/poll.js
+++ b/app/js/tl/poll.js
@@ -4,8 +4,10 @@ function pollToggle() {
         $("#right-side").show()
         $("#right-side").css("width", "300px")
         $("#left-side").css("width", "calc(100% - 300px)")
-        var width = localStorage.getItem("postbox-width").replace("px", "") * 1 + 300;
-        if (!width) {
+        var width = localStorage.getItem("postbox-width");
+        if (width) {
+            width = width.replace("px", "") * 1 + 300
+        } else {
             width = 600
         }
         $("#post-box").css("width", width + "px")
@@ -15,8 +17,10 @@ function pollToggle() {
         $("#right-side").hide()
         $("#left-side").css("width", "100%")
         $("#right-side").css("width", "300px")
-        var width = localStorage.getItem("postbox-width").replace("px", "") * 1;
-        if (!width) {
+        var width = localStorage.getItem("postbox-width");
+        if (width) {
+            width = width.replace("px", "") * 1
+        } else {
             width = 300
         }
         $("#post-box").css("width", width + "px")
diff --git a/app/js/ui/post-box.js b/app/js/ui/post-box.js
index dfdbcf57..2c27ea73 100644
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@@ -4,8 +4,10 @@ function hide() {
 	$("#right-side").hide()
 	$("#right-side").css("width", "300px")
 	$("#left-side").css("width", "100%")
-	var width = localStorage.getItem("postbox-width").replace("px", "") * 1;
-	if (!width) {
+	var width = localStorage.getItem("postbox-width");
+	if(width){
+		width = width.replace("px", "") * 1
+	} else {
 		width = 300
 	}
 	$("#post-box").css("width", width)
@@ -79,6 +81,7 @@ $(function () {
 		minHeight: 150,
 		minWidth: 100,
 		stop: function (event, ui) {
+			$("#textarea").blur()
 			localStorage.setItem("postbox-width", ui.size.width);
 		}
 	});
diff --git a/app/package.json b/app/package.json
index 2b5ba5f5..dc2999e4 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "18.9.1",
+  "version": "18.9.2",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index 21fc9925..e25a3de0 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -231,9 +231,9 @@
 			</div>
 		</div>
 		<div id="right-side">
-			<div id="suggest"></div>
+			<div id="suggest" class="right-side-content"></div>
 			<!--絵文字ピッカー-->
-			<div id="emoji" class="hide">
+			<div id="emoji" class="hide right-side-content">
 				<span class="gray sml">@@emojiWarn@@
 					<a onclick="emojiGet('true')" class="pointer">@@refreshEmoji@@</a>
 					<br>
@@ -288,7 +288,7 @@
 				</div>
 			</div>
 			<!--Poll UI-->
-			<div id="poll" class="hide">
+			<div id="poll" class="hide right-side-content">
 				<div id="mastodon-poll" class="poll-provider">
 					<input type="text" class="mastodon-choice" placeholder="@@choice@@1">
 					<input type="text" class="mastodon-choice" placeholder="@@choice@@2">
@@ -675,11 +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-9-1" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-9-2" 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.9.2)</h5>
+				・トゥートボックスが閉じない、消えない不具合を修正。
 				<h5>Release Note Usamin (18.9.1)</h5>
 				・トゥートボックスのリサイズを横だけにした<br>
 				・アンケートが上手く作成できない不具合を修正。
diff --git a/app/view/make/make.js b/app/view/make/make.js
index 6f2df8a6..f04e20cb 100644
--- a/app/view/make/make.js
+++ b/app/view/make/make.js
@@ -1,6 +1,6 @@
 const fs = require("fs")
 const readlineSync = require('readline-sync')
-let ver = "Usamin (18.9.1)"
+let ver = "Usamin (18.9.2)"
 const execSync = require('child_process').execSync;
 let gitHash = execSync("git rev-parse HEAD").toString().trim()
 fs.writeFileSync("../../git", gitHash)