TheDesk Miria (17.0.1)-beta3

app/js/platform/nano.js

@@ -29,16 +29,10 @@ function tl(data) {
 		var templete = parse([json[0]], '', acct_id, tlid);
 		$("#timeline_nano").html(templete);
 		jQuery("time.timeago").timeago();
-		reload(type, '', acct_id, data);
 	});
-}
-
 //Streaming接続
 var websocket=[];
-function reload(type, cc, acct_id, data) {
     var tlid=0;
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_"+ acct_id + "_at");
 	if (type == "home") {
 		var start = "wss://" + domain +
 			"/api/v1/streaming/?stream=user&access_token=" + at;

app/js/post/status.js

@@ -279,9 +279,11 @@ function redraft(id, acct_id){
 		show();
 		$("#textarea").val(html);
 		var cwtxt=$("[toot-id="+id+"] .cw_text").html();
-		cwtxt=$.strip_tags(cwtxt);
-		cw();
-		$("#cw-text").val(cwtxt);
+		if(cwtxt!=""){
+			cwtxt=$.strip_tags(cwtxt);
+			cw();
+			$("#cw-text").val(cwtxt);
+		}
 	}
 }
 //ピン留め

app/js/tl/date.js

@@ -56,14 +56,38 @@ function date(str, datetype) {
 //特殊フォーマット(インスタンス情報で利用)
 function crat(str) {
 	var date = new Date(str);
-
+	if(date.getMonth()<9){
+		var mnt="0"+(date.getMonth()+1);
+	}else{
+		var mnt=date.getMonth()+1;
+	}
+	if(date.getDate()<10){
+		var dat="0"+date.getDate();
+	}else{
+		var dat=date.getDate();
+	}
+	if(date.getHours()<10){
+		var hrs="0"+date.getHours();
+	}else{
+		var hrs=date.getHours();
+	}
+	if(date.getMinutes()<10){
+		var mns="0"+date.getMinutes();
+	}else{
+		var mns=date.getMinutes();
+	}
+	if(date.getSeconds()<10){
+		var sec="0"+date.getSeconds();
+	}else{
+		var sec=date.getSeconds();
+	}
 	format_str = 'YYYY-MM-DD hh:mm:ss';
 	format_str = format_str.replace(/YYYY/g, date.getFullYear());
-	format_str = format_str.replace(/MM/g, date.getMonth()+1);
-	format_str = format_str.replace(/DD/g, date.getDate());
-	format_str = format_str.replace(/hh/g, date.getHours());
-	format_str = format_str.replace(/mm/g, date.getMinutes());
-	format_str = format_str.replace(/ss/g, date.getSeconds());
+	format_str = format_str.replace(/MM/g, mnt);
+	format_str = format_str.replace(/DD/g, dat);
+	format_str = format_str.replace(/hh/g, hrs);
+	format_str = format_str.replace(/mm/g, mns);
+	format_str = format_str.replace(/ss/g, sec);
 
 	return format_str;
 }

app/js/tl/filter.js

@@ -391,6 +391,9 @@ function exclude(key){
 }
 function excludeCk(key,target){
 	var exc=localStorage.getItem("exclude-"+key);
+	if(!exc){
+		return "";
+	}
 	if(~exc.indexOf(target)){
 		return "checked"
 	}else{

app/js/tl/parse.js

@@ -357,6 +357,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		}
 		if (!toot.application) {
 			var via = '';
+			viashow="hide";
 		} else {
 			var via = toot.application.name;
 			//強調チェック
@@ -374,6 +375,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}
 			});
 		}
+		if(mix=="pinned"){
+			boostback = "emphasized";
+		}
 		if (toot.spoiler_text && cw) {
 			var content = toot.content;
 			var spoil = escapeHTML(toot.spoiler_text);

app/js/ui/layout.js

@@ -149,7 +149,7 @@ function parseColumn() {
 		  key + '">On</span></a>'+lang.lang_layout_linkana +'<br><a onclick="voiceToggle(' + key +
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_tts +'">hearing</i><span id="sta-voice-' +
 		  key + '">On</span></a>'+lang.lang_layout_tts +'TL<br><a onclick="reconnector(' + key +
-		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect[lang]+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
+		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
 			'" class="tl" tlid="' + key + '" data-type="' + acct.type + '"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div></div>';
 		$("#timeline-container").append(html);
 		localStorage.removeItem("pool_" + key);

app/js/userdata/his-data.js

@@ -92,7 +92,7 @@ function pinutl(before,user, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
-		var templete = parse(json, '', acct_id,'user');
+		var templete = parse(json, 'pinned', acct_id,'user');
 		if(!json[0]){
 			templete="";
 		}