vote(Mastodon 2.8)

app/js/post/emoji.js

@@ -11,13 +11,10 @@ function emojiToggle() {
 		selin=0;
 	}
 	localStorage.setItem("cursor", selin);
+
 	if ($("#emoji").hasClass("hide")) {
-		if($("#bottom").hasClass("reverse")){
-			$('#emoji').css("left",$('#post-box').offset().left-295+"px");
-		}else{
-			$('#emoji').css("left",$('#post-box').offset().left+295+"px");
-		}
 		$("#emoji").removeClass("hide")
+		$("#right-side").show()
 		if (!localStorage.getItem("emoji_" + acct_id)) {
 			var html =
 				'<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet(\'true\');">'+lang.lang_emoji_get+'</button>';
@@ -26,7 +23,9 @@ function emojiToggle() {
 			emojiList('home');
 		}
 	} else {
+		$("#poll").addClass("hide")
 		$("#emoji").addClass("hide")
+		$("#right-side").hide()
 	}
 
 

app/js/post/post.js

@@ -55,8 +55,8 @@ function post(mode,postvis) {
 			title: lang.lang_post_cwtitle,
 			message: lang.lang_post_cwtxt+plus,
 			buttons: [lang.lang_post_btn1,lang.lang_post_btn2, lang.lang_post_btn3]
-	  	}
-	  	dialog.showMessageBox(options, function(arg) {
+	  }
+	  dialog.showMessageBox(options, function(arg) {
 			if(arg==1){
 				$("#cw-text").show();
 				$("#cw").addClass("yellow-text");
@@ -122,12 +122,36 @@ function post(mode,postvis) {
 	}
 	if ($("#sch-box").hasClass("sch-avail")) {
 		var scheduled=formattimeutc(new Date(Date.parse($("#sch-date").val())))
+		console.log(scheduled)
 		schedule();
 		toot.scheduled_at=scheduled;
-		
 	} else {
 		var scheduled = "";
 	}
+	if ($("#poll-sel").val()=="mastodon-poll") {
+		var options=[];
+		$(".mastodon-choice").map(function() {
+			var choice=$(this).val();
+			if(choice!=""){
+				options.push(choice);
+			}
+		});
+		if($("#poll-multiple:checked").val()=="1"){
+			var mul=true;
+		}else{
+			var mul=false;
+		}
+		var exin=pollCalc();
+		if(!exin){
+			todc("Error: Poll expires_in param")
+		}
+		toot.poll={
+			options: options,
+			expires_in: exin,
+			multiple: mul
+		}
+	}
+	console.log(toot);
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
@@ -263,6 +287,12 @@ function clear() {
 	$("#preview").html("");
 	$(".toot-btn-group").prop("disabled", false);
 	$("#post-acct-sel").prop("disabled", false);
+	$("#days_poll").val(0);
+  $("#hours_poll").val(0);
+	$("#mins_poll").val(0);
+	$(".mastodon-choice").map(function() {
+		$(this).val("");
+	});
 	localStorage.removeItem("image");
 	if(localStorage.getItem("mainuse")=="main"){
 		$("#post-acct-sel").val(localStorage.getItem("main"));