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

TheDesk Usain (18.9.2)

Browse Source
This commit is contained in:
Cutls
2019-09-01 21:27:18 +09:00
parent 6f7f5cbabc
commit 2b84a27cdc
7 changed files with 65 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/js/post/emoji.js
View File

@@ -14,9 +14,11 @@ function emojiToggle(reaction) {
$("#emoji").removeClass("hide") $("#emoji").removeClass("hide")
$("#right-side").show() $("#right-side").show()
$("#right-side").css("width", "300px") $("#right-side").css("width", "300px")
$("#left-side").css("width","calc(100% - 300px)") $("#left-side").css("width", "calc(100% - 300px)")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1 + 300; var width = localStorage.getItem("postbox-width");
if (!width) { if (width) {
width = width.replace("px", "") * 1 + 300
} else {
width = 600 width = 600
} }
$("#post-box").css("width", width + "px") $("#post-box").css("width", width + "px")
@@ -34,9 +36,11 @@ function emojiToggle(reaction) {
$("#right-side").css("width", "300px") $("#right-side").css("width", "300px")
$("#emoji").addClass("hide") $("#emoji").addClass("hide")
$("#suggest").html(""); $("#suggest").html("");
$("#left-side").css("width","100%") $("#left-side").css("width", "100%")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1; var width = localStorage.getItem("postbox-width");
if (!width) { if (width) {
width = width.replace("px", "") * 1
} else {
width = 300 width = 300
} }
$("#post-box").css("width", width + "px") $("#post-box").css("width", width + "px")

42
app/js/post/suggest.js
View File

@@ -20,8 +20,10 @@ input.addEventListener("focus", function () {
$("#right-side").hide() $("#right-side").hide()
$("#right-side").css("width", "300px") $("#right-side").css("width", "300px")
$("#left-side").css("width", "100%") $("#left-side").css("width", "100%")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1; var width = localStorage.getItem("postbox-width");
if (!width) { if (width) {
width = width.replace("px", "") * 1
} else {
width = 300 width = 300
} }
$("#post-box").css("width", width + "px") $("#post-box").css("width", width + "px")
@@ -51,8 +53,10 @@ input.addEventListener("focus", function () {
$("#right-side").show() $("#right-side").show()
$("#right-side").css("width", "200px") $("#right-side").css("width", "200px")
$("#left-side").css("width", "calc(100% - 200px)") $("#left-side").css("width", "calc(100% - 200px)")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1 + 200; var width = localStorage.getItem("postbox-width");
if (!width) { if (width) {
width = width.replace("px", "") * 1 + 200
} else {
width = 600 width = 600
} }
$("#post-box").css("width", width + "px") $("#post-box").css("width", width + "px")
@@ -63,8 +67,10 @@ input.addEventListener("focus", function () {
$("#right-side").hide() $("#right-side").hide()
$("#right-side").css("width", "300px") $("#right-side").css("width", "300px")
$("#left-side").css("width", "100%") $("#left-side").css("width", "100%")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1; var width = localStorage.getItem("postbox-width");
if (!width) { if (width) {
width = width.replace("px", "") * 1
} else {
width = 300 width = 300
} }
$("#post-box").css("width", width + "px") $("#post-box").css("width", width + "px")
@@ -85,8 +91,10 @@ input.addEventListener("focus", function () {
$("#right-side").hide() $("#right-side").hide()
$("#right-side").css("width", "300px") $("#right-side").css("width", "300px")
$("#left-side").css("width", "100%") $("#left-side").css("width", "100%")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1; var width = localStorage.getItem("postbox-width");
if (!width) { if (width) {
width = width.replace("px", "") * 1
} else {
width = 300 width = 300
} }
$("#post-box").css("width", width + "px") $("#post-box").css("width", width + "px")
@@ -149,8 +157,10 @@ input.addEventListener("focus", function () {
$("#right-side").show() $("#right-side").show()
$("#right-side").css("width", "200px") $("#right-side").css("width", "200px")
$("#left-side").css("width", "calc(100% - 200px)") $("#left-side").css("width", "calc(100% - 200px)")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1 + 200; var width = localStorage.getItem("postbox-width");
if (!width) { if (width) {
width = width.replace("px", "") * 1 + 200
} else {
width = 600 width = 600
} }
$("#post-box").css("width", width + "px") $("#post-box").css("width", width + "px")
@@ -172,8 +182,10 @@ input.addEventListener("focus", function () {
$("#right-side").show() $("#right-side").show()
$("#right-side").css("width", "200px") $("#right-side").css("width", "200px")
$("#left-side").css("width", "calc(100% - 200px)") $("#left-side").css("width", "calc(100% - 200px)")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1 + 200; var width = localStorage.getItem("postbox-width");
if (!width) { if (width) {
width = width.replace("px", "") * 1 + 200
} else {
width = 600 width = 600
} }
$("#post-box").css("width", width + "px") $("#post-box").css("width", width + "px")
@@ -185,8 +197,10 @@ input.addEventListener("focus", function () {
$("#right-side").hide() $("#right-side").hide()
$("#right-side").css("width", "300px") $("#right-side").css("width", "300px")
$("#left-side").css("width", "100%") $("#left-side").css("width", "100%")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1; var width = localStorage.getItem("postbox-width");
if (!width) { if (width) {
width = width.replace("px", "") * 1
} else {
width = 300 width = 300
} }
$("#post-box").css("width", width + "px") $("#post-box").css("width", width + "px")

12
app/js/tl/poll.js
View File

@@ -4,8 +4,10 @@ function pollToggle() {
$("#right-side").show() $("#right-side").show()
$("#right-side").css("width", "300px") $("#right-side").css("width", "300px")
$("#left-side").css("width", "calc(100% - 300px)") $("#left-side").css("width", "calc(100% - 300px)")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1 + 300; var width = localStorage.getItem("postbox-width");
if (!width) { if (width) {
width = width.replace("px", "") * 1 + 300
} else {
width = 600 width = 600
} }
$("#post-box").css("width", width + "px") $("#post-box").css("width", width + "px")
@@ -15,8 +17,10 @@ function pollToggle() {
$("#right-side").hide() $("#right-side").hide()
$("#left-side").css("width", "100%") $("#left-side").css("width", "100%")
$("#right-side").css("width", "300px") $("#right-side").css("width", "300px")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1; var width = localStorage.getItem("postbox-width");
if (!width) { if (width) {
width = width.replace("px", "") * 1
} else {
width = 300 width = 300
} }
$("#post-box").css("width", width + "px") $("#post-box").css("width", width + "px")

7
app/js/ui/post-box.js
View File

@@ -4,8 +4,10 @@ function hide() {
$("#right-side").hide() $("#right-side").hide()
$("#right-side").css("width", "300px") $("#right-side").css("width", "300px")
$("#left-side").css("width", "100%") $("#left-side").css("width", "100%")
var width = localStorage.getItem("postbox-width").replace("px", "") * 1; var width = localStorage.getItem("postbox-width");
if (!width) { if(width){
width = width.replace("px", "") * 1
} else {
width = 300 width = 300
} }
$("#post-box").css("width", width) $("#post-box").css("width", width)
@@ -79,6 +81,7 @@ $(function () {
minHeight: 150, minHeight: 150,
minWidth: 100, minWidth: 100,
stop: function (event, ui) { stop: function (event, ui) {
$("#textarea").blur()
localStorage.setItem("postbox-width", ui.size.width); localStorage.setItem("postbox-width", ui.size.width);
} }
}); });

2
app/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "thedesk", "name": "thedesk",
"version": "18.9.1", "version": "18.9.2",
"description": "TheDesk is a Mastodon client for PC.", "description": "TheDesk is a Mastodon client for PC.",
"repository": "https://github.com/cutls/TheDesk", "repository": "https://github.com/cutls/TheDesk",
"main": "main.js", "main": "main.js",

10
app/view/make/index.sample.html
View File

@@ -231,9 +231,9 @@
</div> </div>
</div> </div>
<div id="right-side"> <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@@ <span class="gray sml">@@emojiWarn@@
<a onclick="emojiGet('true')" class="pointer">@@refreshEmoji@@</a> <a onclick="emojiGet('true')" class="pointer">@@refreshEmoji@@</a>
<br> <br>
@@ -288,7 +288,7 @@
</div> </div>
</div> </div>
<!--Poll UI--> <!--Poll UI-->
<div id="poll" class="hide"> <div id="poll" class="hide right-side-content">
<div id="mastodon-poll" class="poll-provider"> <div id="mastodon-poll" class="poll-provider">
<input type="text" class="mastodon-choice" placeholder="@@choice@@1"> <input type="text" class="mastodon-choice" placeholder="@@choice@@1">
<input type="text" class="mastodon-choice" placeholder="@@choice@@2"> <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://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<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://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br> <a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br> Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<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> <h5>Release Note Usamin (18.9.1)</h5>
・トゥートボックスのリサイズを横だけにした<br> ・トゥートボックスのリサイズを横だけにした<br>
・アンケートが上手く作成できない不具合を修正。 ・アンケートが上手く作成できない不具合を修正。

2
app/view/make/make.js
View File

@@ -1,6 +1,6 @@
const fs = require("fs") const fs = require("fs")
const readlineSync = require('readline-sync') const readlineSync = require('readline-sync')
let ver = "Usamin (18.9.1)" let ver = "Usamin (18.9.2)"
const execSync = require('child_process').execSync; const execSync = require('child_process').execSync;
let gitHash = execSync("git rev-parse HEAD").toString().trim() let gitHash = execSync("git rev-parse HEAD").toString().trim()
fs.writeFileSync("../../git", gitHash) fs.writeFileSync("../../git", gitHash)