TheDesk Miho (ver.13)

app/js/platform/end.js

@@ -65,3 +65,22 @@
   		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
   	});
   };
+  //コピー
+  function execCopy(string){
+	var temp = document.createElement('div');
+  
+	temp.appendChild(document.createElement('pre')).textContent = string;
+  
+	var s = temp.style;
+	s.position = 'fixed';
+	s.left = '-100%';
+  
+	document.body.appendChild(temp);
+	document.getSelection().selectAllChildren(temp);
+  
+	var result = document.execCommand('copy');
+  
+	document.body.removeChild(temp);
+	// true なら実行できている falseなら失敗か対応していないか
+	return result;
+  }

app/js/tl/datails.js

@@ -1,6 +1,6 @@
 //トゥートの詳細
 function details(id, acct_id) {
-	$(".toot-reset").html("トゥートはありません");
+	$(".toot-reset").html("データなし");
 	var html = $("#pub_" + id).html();
 	$("#toot-this").html(html);
 	$('#tootmodal').modal('open');
@@ -21,6 +21,7 @@ function details(id, acct_id) {
 	}).then(function(json) {
 		$("#toot-this .fav_ct").text(json.favourites_count);
 		$("#toot-this .rt_ct").text(json.reblogs_count);
+		$("#tootmodal").attr("data-url",json.url);
 		if (json.in_reply_to_id) {
 			replyTL(json.in_reply_to_id, acct_id);
 		}
@@ -147,3 +148,15 @@ function rted(id, acct_id) {
 		$("#toot-rt").html(templete);
 	});
 }
+//URL等のコピー
+function cbCopy(mode){
+	var url=$("#tootmodal").attr("data-url");
+	var urls = url.match(/https?:\/\/([-.a-zA-Z0-9]+)/);
+	var domain=urls[1];
+	if(mode=="emb"){
+		var emb='<iframe src="'+url+'/embed" class="mastodon-embed" style="max-width: 100%; border: 0" width="400"></iframe><script src="https://'+domain+'/embed.js" async="async"></script>';
+		execCopy(emb)
+	}else{
+		execCopy(url)
+	}
+}

app/js/tl/filter.js

@@ -0,0 +1,28 @@
+//各TL上方のMedia[On/Off]
+function mediaToggle(tlid) {
+	var media = localStorage.getItem("media_" + tlid);
+	if (media) {
+        localStorage.removeItem("media_" + tlid);
+		$("#sta-media-" + tlid).text("Off");
+        $("#sta-media-" + tlid).css("color",'red');
+        $("#timeline_"+tlid).removeClass("media-filter")
+	} else {
+		localStorage.setItem("media_" + tlid, "true");
+		$("#sta-media-" + tlid).text("On");
+        $("#sta-media-" + tlid).css("color",'#009688');
+        $("#timeline_"+tlid).addClass("media-filter")
+	}
+}
+//各TL上方のMedia[On/Off]をチェック
+function mediaCheck(tlid) {
+	var media = localStorage.getItem("media_" + tlid);
+	if (media) {
+		$("#sta-media-" + tlid).text("On");
+        $("#sta-media-" + tlid).css("color",'#009688');
+        $("#timeline_"+tlid).addClass("media-filter")
+	} else {
+		$("#sta-media-" + tlid).text("Off");
+        $("#sta-media-" + tlid).css("color",'red');
+        $("#timeline_"+tlid).removeClass("media-filter")
+	}
+}

app/js/tl/notification.js

@@ -122,9 +122,11 @@ function parseNotf(obj, popup, tlid, acct_id) {
 			var noticetext = '<a onclick="udg(\'' + eachobj.account.id +
 				'\',\'' + acct_id + '\')" class="pointer">'+eachobj.account.display_name + "(" + eachobj.account.acct +
 				")</a>が" + what;
-			if (popup >= 0 && obj.length < 5) {
+			var memory = localStorage.getItem("notice-mem");
+			if (popup >= 0 && obj.length < 5 && noticetext != memory) {
 				Materialize.toast(noticetext, popup * 1000);
 				$(".notf-icon_" + tlid).addClass("red-text");
+				localStorage.setItem("notice-mem",noticetext);
 				notftext="";
 			}
 			if (toot.spoiler_text && cw) {

app/js/tl/parse.js

@@ -87,6 +87,7 @@ function parse(obj, mix, acct_id) {
 			var analyze='';
 		}
 		var viewer = "";
+		var hasmedia="";
 		var youtube = "";
 		var emojick = toot.emojis[0];
 		//絵文字があれば
@@ -103,6 +104,7 @@ function parse(obj, mix, acct_id) {
 		var mediack = toot.media_attachments[0];
 		//メディアがあれば
 		if (mediack) {
+			hasmedia = "hasmedia";
 			var cwdt=100/toot.media_attachments.length
 			Object.keys(toot.media_attachments).forEach(function(key2) {
 				var media = toot.media_attachments[key2];
@@ -118,6 +120,7 @@ function parse(obj, mix, acct_id) {
 			});
 		} else {
 			viewer = "";
+			hasmedia = "nomedia";
 		}
 		var menck = toot.mentions[0];
 		var mentions = "";
@@ -164,7 +167,7 @@ function parse(obj, mix, acct_id) {
 		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
 			boostback + ' ' + fav_app + ' ' + rt_app +
-			'" style="padding-top:5px;" toot-id="' + id + '" unixtime="' + date(obj[
+			' '+ hasmedia + '" style="padding-top:5px;" toot-id="' + id + '" unixtime="' + date(obj[
 				key].created_at, 'unix') + '">' +
 			'<span class="gray sharesta">' + notice + home + '</span>' +
 			'<div style="padding:0; margin:0; width:400px; max-width:100%; display:flex; align-items:flex-end;">' +
@@ -173,8 +176,8 @@ function parse(obj, mix, acct_id) {
 			'<img src="' + toot.account.avatar +
 			'" width="40" class="prof-img" user="' + toot.account.acct +
 			'"></a></div>' +
-			'<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"><big>' +
-			toot.account.display_name + '</big></div>' +
+			'<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"><span class="user">' +
+			toot.account.display_name + '</span></div>' +
 			'<div class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> @' +
 			toot.account.acct + locked + '</div>' +
 			'</div>' +

app/js/ui/layout.js

@@ -12,6 +12,10 @@
 	}
 //最初、カラム変更時に発火
 	function parseColumn() {
+		var size = localStorage.getItem("size");
+		if (size) {
+			$("html").css("font-size", size + "px");
+		}
 		var multi = localStorage.getItem("multi");
 		if (!multi) {
 			var obj = [{
@@ -62,7 +66,9 @@
 				key + '">notifications</i></a>' +
 				'<a onclick="removeColumn(' + key +
 				')" class="setting nex"><i class="material-icons nex" title="このカラムを削除">remove_circle</i></a>' +
-				'<a onclick="cardToggle(' + key +
+				'<a onclick="mediaToggle(' + key +
+				')" class="setting nex"><i class="material-icons nex" title="メディアフィルター">perm_media</i><span id="sta-media-' +
+				key + '">On</span><a onclick="cardToggle(' + key +
 				')" class="setting nex"><i class="material-icons nex" title="リンクの解析を切り替え(OFFで制限を回避出来る場合があります)">link</i><span id="sta-card-' +
 				key + '">On</span></a><a onclick="goTop(' + key + ')" class="setting nex"><i class="material-icons nex" title="一番上へ">vertical_align_top</i></a>' +
 				'<div class="hide notf-indv-box" id="notf-box_' + key +
@@ -76,8 +82,9 @@
 				var data = "";
 			}
 			tl(acct.type, data, acct.domain, key);
-
+			notf(acct.domain, key);
 			cardCheck(key);
+			mediaCheck(key);
 		});
 		var width = localStorage.getItem("width");
 		if (width) {

app/js/ui/post-box.js

@@ -17,6 +17,15 @@ function hide() {
 	$("#post-box").fadeOut();
 	$("#menu-btn").fadeIn();
 }
+//最小化
+function mini() {
+	$("body").toggleClass("mini-post");
+	if($("body").hasClass("mini-post")){
+		$(".mini-btn").text("expand_less");
+	}else{
+		$(".mini-btn").text("expand_more");
+	}
+}
 //最小化時に展開
 function show() {
 	$("#post-box").removeClass("hidenbox");

app/js/ui/radio.js

@@ -9,7 +9,6 @@ function Rtoggle(){
 }
 function Rplay(url,name){
     $("#radio").attr('src',url);
-    r.type = "audio/mpeg";
     r.load();
     r.play();
     $("#radio").addClass("play");

app/js/ui/settings.js

@@ -59,6 +59,11 @@ function settings() {
 	if (imgd != localStorage.getItem("img")) {
 		Materialize.toast("画像投稿後の設定を" + imgd + "に設定しました。", 3000);
 	}
+	var sized = $("#size").val();
+	if (sized != localStorage.getItem("size")) {
+		Materialize.toast("フォントサイズを" + sized + "pxに設定しました。", 3000);
+	}
+	localStorage.setItem("size", sized);
 	localStorage.setItem("img", imgd);
 }
 
@@ -131,6 +136,13 @@ function load() {
 		var img = "no-act";
 	}
 	$("#i_" + img).prop("checked", true);
+
+	var size = localStorage.getItem("size");
+	if (!size) {
+		var size = "15";
+	}
+	$("#size").val(size);
+
 	//並べ替え
 	sortload();
 }