diff --git a/app/css/post.css b/app/css/post.css index e34b5b13..80f76392 100644 --- a/app/css/post.css +++ b/app/css/post.css @@ -122,14 +122,6 @@ textarea { overflow-x: hidden; height: calc(100% - 32px); } -#poll { -} -.poll-provider { - position: absolute; - height: calc(100% - 90px); - overflow-y: scroll; - top: 90px; -} #posttgl,#toot-post-btn { background-color: var(--accentbtn); } diff --git a/app/js/post/post.js b/app/js/post/post.js index 6b8f6487..ef1445e0 100644 --- a/app/js/post/post.js +++ b/app/js/post/post.js @@ -110,7 +110,7 @@ function post(mode, postvis) { } else { var scheduled = ""; } - if ($("#poll-sel").val() == "mastodon-poll") { + if (!$("#poll").hasClass("hide")) { var options = []; $(".mastodon-choice").map(function () { var choice = $(this).val(); @@ -274,6 +274,8 @@ function clear() { $("#days_poll").val(0); $("#hours_poll").val(0); $("#mins_poll").val(6); + $("#poll").addClass("hide") + $("#pollsta").text(lang.lang_no) $(".mastodon-choice").map(function () { $(this).val(""); }); diff --git a/app/js/tl/poll.js b/app/js/tl/poll.js index f81ae580..eaa6270c 100644 --- a/app/js/tl/poll.js +++ b/app/js/tl/poll.js @@ -10,6 +10,7 @@ function pollToggle() { } $("#post-box").css("width", width + "px") $("#poll").removeClass("hide") + $("#pollsta").text(lang.lang_yesno) } else { $("#right-side").hide() $("#left-side").css("width", "100%") @@ -21,6 +22,7 @@ function pollToggle() { $("#post-box").css("width", width + "px") $("#emoji").addClass("hide") $("#poll").addClass("hide") + $("#pollsta").text(lang.lang_no) } } function pollProviderCk() { diff --git a/app/js/ui/post-box.js b/app/js/ui/post-box.js index 15ff4255..dfdbcf57 100644 --- a/app/js/ui/post-box.js +++ b/app/js/ui/post-box.js @@ -45,7 +45,6 @@ function show() { } $('#post-box').css("left", left + "px") $('#post-box').css("top", top + "px") - var height = localStorage.getItem("postbox-height"); var width = localStorage.getItem("postbox-width"); if (width) { $('#post-box').css("width", width + "px") diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index c50ac869..21fc9925 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -168,8 +168,8 @@
@@replyMode@@: @@no@@/@@temp@@: - @@nothing@@/@@vis@@: - public + @@nothing@@/@@poll@@:@@no@@ + public