TheDesk Miria (17.0.0)

2018-12-09 03:46:01 +09:00
parent 8bb27aa8d5
commit bc197db0d5
32 changed files with 632 additions and 224 deletions
--- a/app/view/ja/beta.html
+++ b/app/view/ja/beta.html
@@ -0,0 +1,109 @@
+<!doctype html>
+<!--Vue.jsでなんかTLづくりやってみようみたいなやつ。そっ閉じ推奨。-->
+<html lang="ja">
+<head>
+	<title>Beta - TheDesk</title>
+	<meta content="width=device-width,initial-scale=1.0" name="viewport">
+	<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
+	<meta charset="utf-8">
+</head>
+<a href="index.html">Back</a>
+<div id="tl">
+    <div :id="pub_id" class="cvo" :class="boostback" v-bind:class="{ 'faved': fav_app, 'rted': rt_app, 'pinned':pin_app,'hasmedia':hasmedia}" 
+        :toot-id="id" :unique-id="uniqueid" :data-medias="media_ids" :unixtime="unixtime" :data-notfIndv="if_notf" 
+        @mouseover="mov('mv')" @click="mov('cl')" @mouseout="resetmv('mv')"> 
+        <div class="area-notice"><span class="gray sharesta"><span v-if="notice"><i class="big-text fa" :class="rticon"></i>{{dis_name}}(@{{acct}})<br></span></span></div>
+        <div class="area-icon">
+            <a @click="udg" :user="acct" class="udg"><img :src="avatar" width="40" class="prof-img" :user="acct"></a>
+            <a @click="udg" :user="acct" class="udg" v-if="notice"><img :src="avatar" width="40" class="notf-icon prof-img" :user="acct"></a>
+        </div>
+
+        Yeah
+    </div>
+</div>
+<script>
+var app = new Vue({
+el: '#tl',
+data: {
+    tlid:0,
+    pub_id:"pub_123",
+    id: 123,
+    uniqueid:1234,
+    boostback:'a',
+    fav_app:true,
+    rt_app:true,
+    pin_app:false,
+    hasmedia:false,
+    media_ids:'',
+    unixtime:'1238954',
+    if_notf:''
+},
+methods: {
+    mov: function (c) {
+      mov(this.id,this.tlid,c)
+    },
+    resetmv: function (c) {
+      resetmv(c)
+    }
+  }
+})
+
+</script>
+<script>
+function mov(a,b,c){
+    console.log(a+":"+b+":"+c);
+}
+function resetmv(a){
+    console.log(a);
+}
+</script>
+<!--@mouseover="mov({{id}},{{tlid}},'mv')" @click="mov({{id}},{{tlid}},'cl')" @mouseout="resetmv('mv')"-->
+<!--
+    <div id="pub_toot.id" class="cvo boostback fav_app rt_app pin_app hasmedia" toot-id="id" unique-id="uniqueid" data-medias="media_ids " unixtime="date(obj[key].created_at, unix)" if_notf onmouseover="mov(toot.id,tlid,mv)" onclick="mov(toot.id,tlid,cl)" onmouseout="resetmv(mv)"> 
+			<div class="area-notice"><span class="gray sharesta">noticehome</span></div> 
+			<div class="area-icon">
+                <a onclick="udg(toot.account.id,acct_id);" user="toot.account.acct" class="udg"><img src="avatar" width="40" class="prof-img" user="toot.account.acct"></a>noticeavatar
+            </div> 
+			<div class="area-display_name">
+                <div class="flex-name"><span class="user">dis_name</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;">@toot.account.acctlocked</span></div> 
+			<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(toot.url);" title="date(toot.created_at, absolute)(lang_parse_clickcopyurl[lang])"><i class="fa fa-clock-o"></i> 
+			date(toot.created_at, datetype)</span> 
+			</div></div> 
+			<div class="area-toot"><span class="api_spoil cw_text_toot.id">spoilspoiler_show</span><span class="toot spoiler">content</span> 
+			viewer 
+			</div><div class="area-additional"><span class="additional">analyze</span>mentionstags</div> 
+			<div class="area-vis"></div>
+			<div class="area-actions mouseover"> 
+			<div class="action">vis</div>
+			<div class="action antinoauth"><a onclick="detEx(toot.url,main)" class="waves-effect waves-dark details" style="padding:0">lang_parse_det[lang]</a></div> 
+            <div class="action disp["re"] noauth"><a onclick="re(toot.id,toot.account.acct,acct_id,visen)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_replyto[lang]">
+                <i class="fa fa-share"></i><span class="rep_ct">replyct</a></span></a></div> 
+			<div class="action can_rt disp["rt"] noauth"><a onclick="rt(toot.id,acct_id,tlid)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_bt[lang]"><i class="text-darken-3 fa fa-retweet
+			if_rt rt_toot.id"></i><span class="rt_ct">toot.reblogs_count 
+			</span></a></div> 
+			<div class="action can_rt disp["qt"] noauth"><a onclick="qt(toot.id,acct_id 
+			,toot.account.acct ,toot.url
+			)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_quote[lang]"><i class="text-darken-3 fa fa-quote-right"></i></a></div> 
+			<div class="action disp["fav"] noauth"><a onclick="fav(toot.id,acct_id 
+			,tlid 
+			)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_fav[lang]"><i class="fa text-darken-3 fa-star 
+			if_fav fav_toot.id"></i><span class="fav_ct">toot.favourites_count 
+			</a></span></div> 
+			<div class="if_mine action disp["del"] noauth"><a onclick="del(toot.id, 
+			acct_id 
+			)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_del[lang]"><i class="fa fa-trash-o"></i></a></div> 
+			<div class="if_mine action pin disp["pin"] noauth"><a onclick="pin(toot.id, 
+			acct_id 
+			)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_pin[lang]"><i class="fa fa-map-pin pin_toot.id if_pin"></i></a></div> 
+			<div class="if_mine action disp["red"] noauth"><a onclick="redraft(toot.id, 
+			acct_id 
+			)" class="waves-effect waves-dark btn-flat" style="padding:0" title="lang_parse_redraft[lang]"><i class="material-icons">redo</i></a></div>trans
+			<span class="cbadge viabadge waves-effect viashow mine_via" onclick="client($.strip_tags(via))" title="via $.strip_tags(via)">via
+			via 
+			</span>
+			</div><div class="area-side mouseover"><div class="action if_mine noauth"><a onclick="toggleAction(toot.id,tlid,acct_id)" class="waves-effect waves-dark btn-flat" style="padding:0"><i class="text-darken-3 material-icons act-icon">expand_more</i></a></div> 
+			<div class="action noauth"><a onclick="details(toot.id,acct_id 
+			,tlid)" class="waves-effect waves-dark btn-flat details" style="padding:0"><i class="text-darken-3 material-icons">more_vert</i></a></div> 
+			</div></div> 
+			</div></div>
+-->
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -26,7 +26,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Akane (16.1.5)";
+var ver="Miria (17.0.0)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -35,7 +35,7 @@ var winstore=false;
 var acct_id=0;
 var tlid=0;
 var lang="ja";
-  verck(ver);
+  verck(ver,winstore);
 </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
 <div id="tl">
@@ -528,28 +528,16 @@ var lang="ja";
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 		<br>
-			<div id="release-Akane_16-1-5" style="display:none">
+			<div id="release-Miria_17-0-0" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Akane (16.1.5)</h5>
-					16.1.5<br>
-					<ul>
-						<li>バグ,脆弱性修正</li>
-					</ul>
-					16.1.4<br>
-					<ul>
-						<li>全てバグ修正(5件ほど)</li>
-					</ul>
-					ご迷惑をおかけしたことをお詫び申し上げます。
-					16.1.3<br>
-					<ul>
-						<li>セカンダリートゥートボタン</li>
-						<li>読み上げや絵文字に関するバグの修正</li>
-						<li>公式ヘルプサイト:<a href="https://docs.thedesk.top">TheDesk Docs</a></li>
-					</ul>
-					いつの間にかリアルタイムユーザー数が100を超えていました。皆様のご愛顧に感謝申し上げます。<br>
+					<h5>Release Note Miria (17.0.0)</h5>
+					セキュリティアップデート、安定性の向上。<br>
+					<b>#InstanceTickerが使用できるように</b><br>
+					<b>フォントが直感的に選べるように</b><br>
+					<b>リンク解析をオンにしても制限がかからないように</b>(これによりデフォルトでオンになります。)<br>
 			</div>
 			<br><br>
 			<h3>ご支援ください。</h3>
--- a/app/view/ja/oss.html
+++ b/app/view/ja/oss.html
@@ -876,6 +876,29 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.<br>
+<h5>#InstanceTicker</h5>
+The MIT License (MIT)<br>
+<br>
+ORIGINAL CSS © 小田急don <a href="https://odakyu.app/@ars42525">https://odakyu.app/@ars42525</a><br>
+#InstanceTicker © weep.me <a href="https://weep.me/@weep">https://weep.me/@weep</a><br>
+<br>
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:<br>
+<br>
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.<br>
+<br>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.<br>
 </article>
 <a href="setting.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>戻る</a>
 <script type="text/javascript" src="../../js/ui/theme.js"></script>
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@@ -59,7 +59,12 @@
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
 		<br>
 		<h5>フォント</h5>
-		ローカルフォントを指定します。<br>
+		「選択」を押してフォントを選んでください。<br>
+		<button class="btn waves-effect" style="width:100px;" onclick="font()">選択</button><br>
+		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;">
+
+		</div>
+		<br>
 		<input type="text" style="width:150px" id="font">
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
 		<br>
@@ -162,6 +167,12 @@
 		<input type="text" style="width:50px" id="img-height">px
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
 		<br>
+		<h5>#InstanceTickerを使う</h5>
+		トゥートした人の所属インスタンスをわかりやすく彩ります(自インスタンス以外のトゥート向け)。<a href="https://cdn.weep.me/mastodon/">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.<br>
+		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_yes" value="yes" />
+		<label for="ticker_yes">はい</label>
+		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_no" value="no" />
+		<label for="ticker_no">いいえ</label>
 		<br>
 	</div>
 	</li>