TheDesk Riina (ver.6)

.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

LATEST.md

@@ -1,17 +1,15 @@
 ## For Markdown-supporting Instances
 
-[TheDesk](https://thedesk.top) :thedesk: Riina (ver.5)  
+[TheDesk](https://thedesk.top) :thedesk: Riina (ver.6)  
 ・デザイン修正
-・コンパクトな設定画面
+・ちょっとしたシャドウ
-・ちょっとしたアニメーション
 ・バグ修正
  :github: [cutls/TheDesk](https://github.com/cutls/TheDesk) #Desk #DeskUpdate
 
  ## For Vanilla Instances
 
- WindowsクライアントTheDesk Riina (ver.5)リリース
+ WindowsクライアントTheDesk Riina (ver.6)リリース
 ・デザイン修正
-・コンパクトな設定画面
+・ちょっとしたシャドウ
-・ちょっとしたアニメーション
 ・バグ修正
 https://thedesk.top

app/css/master.css

@@ -1,5 +1,5 @@
 /*共通CSS*/
-body{overflow:hidden;}
+body{overflow:hidden; user-select: none; cursor:default;}
 .btn {
   margin: 5px;
   text-transform: none;

app/css/tl.css

@@ -26,8 +26,10 @@ iframe {
   min-width: 300px;
   height: 100vh;
   flex: 1;
+  border: thin solid gray;
 }
 .user{
+  cursor:text;
   font-size:1.2rem;
 }
 .tl-box{ height:calc(100% - 40px); overflow-y:scroll; overflow-x:hidden }
@@ -43,7 +45,6 @@ iframe {
   padding-right: 2px;
   word-break: break-all;
   width: 100%;
-  height: 100%;
   display: grid;
   grid-template-columns: 43px 2fr 1fr;
   grid-template-areas: 'notice notice notice' 'icon display_name acct' 'icon toot toot' 'icon additional additional' 'actions actions date_via';
@@ -61,6 +62,7 @@ grid-area: icon;
 }
 
 .area-display_name {
+  user-select: auto;
 height:1.5em;
 margin:2px;
 overflow:hidden;
@@ -79,6 +81,8 @@ text-overflow: ellipsis;
 }
 
 .area-toot {
+  cursor:text;
+  user-select: auto;
 margin:2px;
 grid-area: toot;
 }
@@ -89,6 +93,8 @@ grid-area: toot;
 }
 
 .area-additional {
+  cursor:text;
+  user-select: auto;
   grid-area: additional;
   }
 

app/index.html

@@ -23,7 +23,7 @@
 <script type="text/javascript" src="./js/common/keyshortcut.js"></script>
 <script type="text/javascript" src="./js/common/modal.js"></script>
 <script>
-var ver="Riina (ver.5)";
+var ver="Riina (ver.6)";
 //betaを入れるとバージョンチェックしない
 //var ver="beta";
 var acct_id=0;
@@ -56,7 +56,7 @@ var tlid=0;
 <!--ドラッグハンドラ-->
 <div id="drag"><div id="drag-content">ここにドラッグして添付(ドラッグと同時にアップロードされます)<br><button class="btn waves-effect" onclick="closedrop()">閉じる</button></div></div>
 <!--アカウント追加-->
-<div id="add-box" class="hide">
+<div id="add-box" class="hide z-depth-4">
 	  <div class="input-field">
 	  アカウント選択<br>
     <select id="add-acct-sel" class="acct-sel" style="color:black">
@@ -78,7 +78,7 @@ var tlid=0;
 	<button class="btn waves-effect orange " style="width:calc( 100% - 10px);" onclick="addToggle()"><i class="material-icons left">close</i>閉じる</button>
 </div>
 <!--検索-->
-<div id="src-box" class="hide notf-box">
+<div id="src-box" class="hide notf-box z-depth-4">
 	<div class="input-field">
           <i class="material-icons prefix">search</i>
           <input id="src" type="text" class="validate" style="width:calc( 70% - 40px);">
@@ -101,7 +101,7 @@ var tlid=0;
 <!--TLのTL-->
 <div id="timeline-container">
 </div>
-<div id="post-box">
+<div id="post-box" class="z-depth-3">
 <!--トゥートボックス-->
 <span class="cancel">
 	<i class="material-icons" onclick="hide()" title="このボックスを閉じる(X)">cancel</i>

app/js/tl/date.js

@@ -59,7 +59,7 @@ function crat(str) {
 
 	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());
+	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());

app/js/tl/mix.js

@@ -145,7 +145,7 @@ function mixre(acct_id, tlid) {
 					}
 					localStorage.setItem("pool", pool);
 				} else {
-					$("#timeline_" + tlid).prepend(templete);
+					$("#timeline_" + tlid).before(templete);
 				}
 				additional(acct_id, tlid);
 				jQuery("time.timeago").timeago();
@@ -203,7 +203,7 @@ function mixmore(tlid) {
 			console.error(error);
 		}).then(function(obj) {
 			if (!$("[toot-id=" + obj[0].id + "]").length) {
-				$("#timeline_" + tlid + " .cvo").first().prepend(parse([obj[0]], 'home',
+				$("#timeline_" + tlid + " .cvo").first().before(parse([obj[0]], 'home',
 					acct_id));
 			}
 			Object.keys(obj).forEach(function(key) {
@@ -217,7 +217,7 @@ function mixmore(tlid) {
 					if (!$("[toot-id=" + toot.id + "]").length) {
 						if (key2 > tarunix) {
 							var local = locals[key2];
-							$("[toot-id=" + local + "]").append(parse([toot], 'home',
+							$("[toot-id=" + local + "]").after(parse([toot], 'home',
 								acct_id));
 							tarunix = 0;
 						}

app/js/tl/notification.js

@@ -320,7 +320,7 @@ function parseNotf(obj, popup, tlid, acct_id) {
 				'"></a></div>' +
 				'<div class="area-display_name"><span class="user">' +
 				toot.account.display_name +
-				'</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> @' +
+				'</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;cursor:text;"> @' +
 				toot.account.acct + locked + '</span></div>' +
 				'<div class="area-acct"><div><span class="cbadge pointer" onclick="tootUriCopy(\'' + toot.url +
 				'\');" title="' + date(toot.created_at, 'absolute') +

app/js/tl/parse.js

@@ -214,7 +214,7 @@ function parse(obj, mix, acct_id) {
 			'"></a></div>' +
 			'<div class="area-display_name"><span class="user">' +
 			toot.account.display_name +
-			'</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> @' +
+			'</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;"> @' +
 			toot.account.acct + locked + '</span></div>' +
 			'<div class="area-acct"><div><span class="cbadge pointer" onclick="tootUriCopy(\'' +
 			toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
@@ -295,9 +295,9 @@ function userparse(obj, auth, acct_id, notf) {
 			acct_id + ');" user="' + toot.acct + '" class="udg">' +
 			'<img src="' + toot.avatar + '" width="40" class="prof-img" user="' + toot
 			.acct + '"></a></div>' +
-			'<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"><big>' +
+			'<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"><big>' +
 			toot.display_name + '</big></div>' +
-			'<div class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> @' +
+			'<div class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"> @' +
 			toot.acct + locked + '</div>' +
 			'</div>' + auth +
 			'<div style="justify-content:space-around"> <div class="cbadge" style="width:100px;">Follows:' +

app/js/ui/layout.js

@@ -62,7 +62,7 @@
 		Object.keys(obj).forEach(function(key) {
 			var acct = obj[key];
 			var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
-				'"><div class="notice-box">'+
+				'"><div class="notice-box z-depth-2">'+
 				'<div class="area-notice"><i class="material-icons" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>'+
 				'<div class="area-notice_name"><span id="notice_' + key + '"" class="tl-title"></span></div>'+
 				'<div class="area-a1"><a onclick="notfToggle(' + acct.domain + ',' + key +

app/js/ui/scroll.js

@@ -25,9 +25,10 @@ function scrollck() {
 			}
 		}
 		//続きを読むトリガー
-		var scrt = $(this).find(".tl").height() - 1000;
+		var scrt = $(this).find(".tl").height() - 1500;
 		var scr = $(this).scrollTop();
 		if (scr > scrt) {
+			console.log("続き")
 			moreload('', tlid);
 		}
 	});

app/js/userdata/his-data.js

@@ -71,7 +71,7 @@ function flw(user, more, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
-		var templete = userparse(json);
+		var templete = userparse(json,'',acct_id);
 		if (more) {
 			$("#his-follow-list-contents").append(templete);
 		} else {
@@ -112,7 +112,7 @@ function fer(user, more, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
-		var templete = userparse(json);
+		var templete = userparse(json,'',acct_id);
 		if (more) {
 			$("#his-follower-list-contents").append(templete);
 		} else {
@@ -149,7 +149,7 @@ function showFav(more, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
-		var templete = parse(json);
+		var templete = parse(json, '', acct_id);
 		if (more) {
 			$("#his-fav-list-contents").append(templete);
 		} else {
@@ -185,7 +185,7 @@ function showMut(more, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
-		var templete = userparse(json);
+		var templete = userparse(json,'',acct_id);
 		if (more) {
 			$("#his-muting-list-contents").append(templete);
 		} else {
@@ -221,7 +221,7 @@ function showBlo(more, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
-		var templete = userparse(json);
+		var templete = userparse(json,'',acct_id);
 		if (more) {
 			$("#his-blocking-list-contents").append(templete);
 		} else {
@@ -257,7 +257,7 @@ function showReq(more, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
-		var templete = userparse(json, 'true');
+		var templete = userparse(json, 'true',acct_id);
 		if (more) {
 			$("#his-request-list-contents").append(templete);
 		} else {

app/js/userdata/showOnTL.js

@@ -10,6 +10,7 @@ if(location.search){
 	}
 }
 function udg(user, acct_id) {
+	reset();
 	if (!user) {
 		user = localStorage.getItem("user-id_"+acct_id);
 		console.log(user);
@@ -18,6 +19,7 @@ function udg(user, acct_id) {
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem(domain + "_at");
 	var start = "https://" + domain + "/api/v1/accounts/" + user;
+	console.log(start);
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -41,8 +43,9 @@ function udg(user, acct_id) {
 		if (json.moved) {
 			Materialize.toast(
 				'このアカウントは移行します<button class="btn-flat toast-action" onclick="udg(\"' +
-				json.moved + '\")">移行先を見る</button>', 4000)
+				json.moved + ','+acct_id+'\")">移行先を見る</button>', 4000)
 		} else {
+			$('#his-data').modal('open');
 			$('#his-data').attr("user-id", user);
 			$('#his-data').attr("use-acct", acct_id);
 			if(json.username!=json.acct){
@@ -51,6 +54,9 @@ function udg(user, acct_id) {
 			}else{
 				$('#his-data').attr("remote", "false");
 			}
+			utl(json.id, '', acct_id);
+			flw(json.id, '', acct_id);
+			fer(json.id, '', acct_id);
 			$("#his-name").text(json.display_name);
 			$("#his-acct").text(json.acct);
 			$("#his-prof").attr("src", json.avatar);
@@ -58,18 +64,17 @@ function udg(user, acct_id) {
 			$("#his-sta").text(json.statuses_count);
 			$("#his-follow").text(json.following_count);
 			$("#his-follower").text(json.followers_count);
-			$("#his-des").html(json.note);
-			$('#his-data').modal('open');
-			utl(json.id, '', acct_id);
-			flw(json.id, '', acct_id);
-			fer(json.id, '', acct_id);
-			$('ul.tabs').tabs();
-			$('#his-data').css('background-size', 'cover');
 			$("#his-since").text(crat(json.created_at));
+			$("#his-des").html(json.note);
+			$('#his-data').css('background-size', 'cover');
 			localStorage.setItem("history" , user);
-		}
 			//自分の時
 			if (json.acct == localStorage.getItem("user_"+acct_id)) {
+				showFav('', acct_id);
+				showBlo('', acct_id);
+				showMut('', acct_id);
+				showDom('', acct_id);
+				showReq('', acct_id);
 				$("#his-name-val").val(json.display_name);
 				var des = json.note;
 				des = des.replace(/<br \/>/g, "\n")
@@ -82,15 +87,11 @@ function udg(user, acct_id) {
 				$("#his-domain-btn").hide();
 				$("#my-data-nav").show();
 				$("#his-data-nav").hide();
-			$('ul.tabs').tabs('select_tab', 'his-tl');
-			showFav('', acct_id);
-			showBlo('', acct_id);
-			showMut('', acct_id);
-			showDom('', acct_id);
-			showReq('', acct_id);
 			} else {
 				relations(user, acct_id);
 			}
+			$('ul.tabs').tabs('select_tab', 'his-tl');
+		}
 		todc();
 	});
 }
@@ -169,6 +170,11 @@ function relations(user, acct_id) {
 //オールリセット
 function hisclose() {
 	$('#his-data').modal('close');
+	reset();
+	$('#his-data').attr("history", "");
+	localStorage.removeItem("history");
+}
+function reset(){
 	$("#his-name").text("Loading");
 	$("#his-acct").text("");
 	$("#his-prof").attr("src", "./img/loading.svg");
@@ -199,6 +205,4 @@ function hisclose() {
 	$("#his-data-nav").show();
 	$(".cont-series").html("");
 	$("#domainblock").val("");
-	$('#his-data').attr("history", "");
-	localStorage.removeItem("history");
 }

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "TheDesk",
-  "version": "12.5.0",
+  "version": "12.6.0",
   "description": "TheDesk on Mastodonはシンプルと多機能を両立したデスクトップ向けクライアントです",
   "main": "main.js",
   "scripts": {

ver.json

@@ -1 +1 @@
-{"desk":"Riina (ver.5)","date":"2018-02-25","detail":"内部V:12.5.0|デザインとバグ修正。詳しくはGitHub参照"}
+{"desk":"Riina (ver.6)","date":"2018-02-25","detail":"内部V:12.5.0|デザインとバグ修正。詳しくはGitHub参照"}