Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #45 from cutls/WIP-(before-CI)

Browse Source 
TheDesk Usamin (18.1.2)
This commit is contained in:
Cutls
2019-04-02 23:51:17 +09:00
committed by GitHub
parent 348c5c31c0 0df8baa7bf
commit b28023bec2
21 changed files with 99 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/css/tl.css
View File

@@ -112,6 +112,13 @@ iframe {
border-top:none; border-top:none;
display:flex; display:flex;
flex-direction: column; flex-direction: column;
margin-bottom: -10px;
}
.img_FTL{
display:none;
}
.bbcode_FTL{
display:none;
} }
.boxIn{ .boxIn{
height:100%; height:100%;

1
app/js/lang/lang.en.js
View File

@@ -153,6 +153,7 @@ var lang={
"lang_parse_faved":" favourited your toot", "lang_parse_faved":" favourited your toot",
"lang_parse_bted":" boosted your toot", "lang_parse_bted":" boosted your toot",
"lang_parse_btedsimple":" boosted", "lang_parse_btedsimple":" boosted",
"lang_parse_polled":"'s poll",
"lang_parse_notftime":"Actioned at", "lang_parse_notftime":"Actioned at",
"lang_parse_cwshow":"Show", "lang_parse_cwshow":"Show",
"lang_parse_fulltext":"Full size text:", "lang_parse_fulltext":"Full size text:",

1
app/js/lang/lang.ja.js
View File

@@ -153,6 +153,7 @@ var lang={
"lang_parse_faved":"がお気に入り登録しました", "lang_parse_faved":"がお気に入り登録しました",
"lang_parse_bted":"がブーストしました", "lang_parse_bted":"がブーストしました",
"lang_parse_btedsimple":"がブースト", "lang_parse_btedsimple":"がブースト",
"lang_parse_polled":"のアンケート",
"lang_parse_notftime":"通知された時間", "lang_parse_notftime":"通知された時間",
"lang_parse_cwshow":"見る", "lang_parse_cwshow":"見る",
"lang_parse_fulltext":"以下全文", "lang_parse_fulltext":"以下全文",

23
app/js/post/img.js
View File

@@ -183,22 +183,20 @@ function toBlob(base64, type) {
var element = document.querySelector("#textarea"); var element = document.querySelector("#textarea");
element.addEventListener("paste", function(e){ element.addEventListener("paste", function(e){
console.log(e) console.log(e)
// 画像の場合 if (!e.clipboardData || !e.clipboardData.items) {
// e.clipboardData.types.length == 0 return true;
// かつ }
// e.clipboardData.types[0] == "Files" // DataTransferItemList に画像が含まれいない場合は終了する
// となっているので、それ以外を弾く var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith('image'));
if (!e.clipboardData if (imageItems.length == 0) {
|| !e.clipboardData.types
|| (e.clipboardData.types.length != 1)
|| (e.clipboardData.types[0] != "Files")) {
console.log("not image") console.log("not image")
return true; return true;
} }
// ファイルとして得る // ファイルとして得る
// (なぜかgetAsStringでは上手くいかなかった) // DataTransferItem の kind は file なので getAsString ではなく getAsFile を呼ぶ
var imageFile = e.clipboardData.items[0].getAsFile(); var imageFile = imageItems[0].getAsFile();
var imageType = imageItems[0].type;
// FileReaderで読み込む // FileReaderで読み込む
var fr = new FileReader(); var fr = new FileReader();
@@ -209,7 +207,8 @@ element.addEventListener("paste", function(e){
if(mediav){ if(mediav){
var i=mediav.split(",").length; var i=mediav.split(",").length;
} }
media(base64, "image/png", i) // DataTransferItem の type に mime tipes があるのでそれを使う
media(base64, imageType, i)
}; };
fr.readAsDataURL(imageFile); fr.readAsDataURL(imageFile);

10
app/js/tl/filter.js
View File

@@ -421,6 +421,16 @@ function exclude(key){
}else{ }else{
excludetxt="?exclude_types[]=follow" excludetxt="?exclude_types[]=follow"
} }
var follow=true;
}else{
var follow=false;
}
if($('#exc-poll-'+key+':checked').val()){
if(reply || bt || fav || follow){
excludetxt=excludetxt+"&exclude_types[]=poll"
}else{
excludetxt="?exclude_types[]=poll"
}
}else{ }else{
} }
localStorage.setItem("exclude-"+key,excludetxt) localStorage.setItem("exclude-"+key,excludetxt)

3
app/js/tl/parse.js
View File

@@ -228,6 +228,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
if(!locale && localStorage.getItem("fav_" + acct_id)){ if(!locale && localStorage.getItem("fav_" + acct_id)){
what = localStorage.getItem("fav_" + acct_id); what = localStorage.getItem("fav_" + acct_id);
} }
} else if (toot.type == "poll") {
var what = lang.lang_parse_polled;
var icon = "fa-tasks purple-text";
} }
var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.created_at, var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.created_at,
'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at, 'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at,

3
app/js/ui/layout.js
View File

@@ -146,6 +146,7 @@ function parseColumn() {
'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'" '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fa fa-star exc-icons"></i></label> '+ '<input type="checkbox" class="filled-in" id="exc-fav-'+key+'" '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fa fa-star exc-icons"></i></label> '+
'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fa fa-retweet exc-icons"></i></label> '+ '<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fa fa-retweet exc-icons"></i></label> '+
'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fa fa-users exc-icons"></i></label> '+ '<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fa fa-users exc-icons"></i></label> '+
'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"poll")+' /><label for="exc-poll-'+key+'" class="exc-chb" ><i class="fa fa-tasks exc-icons"></i></label> '+
'<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('+key+')">Filter</button><br>'; '<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('+key+')">Filter</button><br>';
}else if(acct.type=="home"){ }else if(acct.type=="home"){
var exclude='<a onclick="ebtToggle(' + key + var exclude='<a onclick="ebtToggle(' + key +
@@ -433,7 +434,7 @@ function webviewParse(url,key,insert,icnsert,css){
')" class="setting nex" title="'+lang.lang_layout_setthis +'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+ ')" class="setting nex" title="'+lang.lang_layout_setthis +'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
'<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key + '<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
'"></div><div class="column-hide notf-indv-box" id="util-box_' + key + '"></div><div class="column-hide notf-indv-box" id="util-box_' + key +
'" style="padding:5px;">'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '" style="width:100%;height:calc(100% - 110px);"><div id="timeline_' + key + '" style="padding:5px;">'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '" style="width:100%;height:100%;"><div id="timeline_' + key +
'" class="tl" tlid="' + key + '" data-type="webview" style="width:100%;height:100%;"><webview src="'+url+'" style="width:100%;height:100%;" id="webview" preload="./js/platform/twitter.js"></webview></div></div></div>'; '" class="tl" tlid="' + key + '" data-type="webview" style="width:100%;height:100%;"><webview src="'+url+'" style="width:100%;height:100%;" id="webview" preload="./js/platform/twitter.js"></webview></div></div></div>';
return html; return html;

6
app/view/en/index.html
View File

@@ -32,7 +32,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver="Usamin (18.1.1)"; var ver="Usamin (18.1.2)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@@ -608,8 +608,8 @@ var tlid=0;
<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank"> <a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
Support on Enty Support on Enty
</a> </a>
<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://osushi.love/Cutls_P" target="_blank"> <a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
Osushi.love: give me sushi Support on Pixiv FANBOX
</a> </a>
<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank"> <a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
Amazon Wish List Amazon Wish List

2
app/view/en/setting.html
View File

@@ -350,10 +350,10 @@
<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>About TheDesk</button> <button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>About TheDesk</button>
<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>Website</a> <a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>Website</a>
<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Enty)</a> <a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Enty)</a>
<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Pixiv FANBOX)</a>
<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>Help/Docs(Constructing)</a> <a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>Help/Docs(Constructing)</a>
<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a> <a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a> <a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
<a class="btn waves-effect red lighten-2" href="https://osushi.love/Cutls_P" target="_blank" style="width:100%; max-width:500px;"><img src="../../img/sushi.svg" class="left" width="25" style="padding-top:5px;">Give me a sushi!</a>
<br> <br>
Kyash<br> Kyash<br>
<img src="../../img/kyash.png" width="100"><br> <img src="../../img/kyash.png" width="100"><br>

24
app/view/en/update.html
View File

@@ -62,9 +62,6 @@ a,button,input,label,i{
#prog{ #prog{
font-size:200%; font-size:200%;
} }
.linux, .mac{
display:none;
}
</style> </style>
<script type="text/javascript" src="../../js/common/jquery.js"></script> <script type="text/javascript" src="../../js/common/jquery.js"></script>
<script type="text/javascript" src="../../js/platform/first.js"></script> <script type="text/javascript" src="../../js/platform/first.js"></script>
@@ -78,11 +75,10 @@ a,button,input,label,i{
<p>Get latest TheDesk</p> <p>Get latest TheDesk</p>
<span id="now"></span>→<b id="ver"></b><br> <span id="now"></span>→<b id="ver"></b><br>
<span id="det"></span><br> <span id="det"></span><br>
<button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">Installer ver.</button> <button class="waves-effect btn windows hide" onclick="update('install')" style="margin-left:15px;">Installer ver.</button>
<button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">Portable ver.</button> <button class="waves-effect btn windows hide" onclick="update('portable')" style="margin-left:15px;">Portable ver.</button>
<span class="linux">Snap ver may be on Snapcraft<br></span> <button class="waves-effect btn linux hide" onclick="update('linux')" style="margin-left:15px;">Start</button>
<button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">Start</button> <button class="waves-effect btn mac hide" onclick="update('mac')" style="margin-left:15px;">Start</button>
<button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">Start</button>
<br> <br>
Some problems?<br>Please download on <a href="https://thedesk.top">Oficial HP</a>. Some problems?<br>Please download on <a href="https://thedesk.top">Oficial HP</a>.
</div> </div>
@@ -184,12 +180,12 @@ function verck(){
var remote=electron.remote; var remote=electron.remote;
var platform=remote.process.platform; var platform=remote.process.platform;
var bit=process.arch; var bit=process.arch;
if(platform=="linux"){ if(platform=="win32"){
$('.windows').hide() $('.windows').removeClass("hide")
$('.linux').show() }else if(platform=="linux"){
}else if(platform=="mac"){ $('.linux').removeClass("hide")
$('.windows').hide() }else if(platform=="darwin"){
$('.mac').show() $('.mac').removeClass("hide")
} }
var start="https://thedesk.top/ver.json"; var start="https://thedesk.top/ver.json";
fetch(start, { fetch(start, {

6
app/view/ja/index.html
View File

@@ -32,7 +32,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver="Usamin (18.1.1)"; var ver="Usamin (18.1.2)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@@ -608,8 +608,8 @@ var tlid=0;
<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank"> <a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
Entyで支援 Entyで支援
</a> </a>
<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://osushi.love/Cutls_P" target="_blank"> <a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
Osushi.loveで寿司を贈る Pixiv FANBOXで支援
</a> </a>
<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank"> <a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
Amazonほしいものリスト Amazonほしいものリスト

2
app/view/ja/setting.html
View File

@@ -350,10 +350,10 @@
<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>このソフトについて</button> <button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>このソフトについて</button>
<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>公式HP</a> <a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>公式HP</a>
<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>支援(Enty)</a> <a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>支援(Enty)</a>
<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>支援(Pixiv FANBOX)</a>
<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>ヘルプ/Docs(Constructing)</a> <a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>ヘルプ/Docs(Constructing)</a>
<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a> <a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a> <a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
<a class="btn waves-effect red lighten-2" href="https://osushi.love/Cutls_P" target="_blank" style="width:100%; max-width:500px;"><img src="../../img/sushi.svg" class="left" width="25" style="padding-top:5px;">寿司を投げる</a>
<br> <br>
Kyash<br> Kyash<br>
<img src="../../img/kyash.png" width="100"><br> <img src="../../img/kyash.png" width="100"><br>

24
app/view/ja/update.html
View File

@@ -62,9 +62,6 @@ a,button,input,label,i{
#prog{ #prog{
font-size:200%; font-size:200%;
} }
.linux, .mac{
display:none;
}
</style> </style>
<script type="text/javascript" src="../../js/common/jquery.js"></script> <script type="text/javascript" src="../../js/common/jquery.js"></script>
<script type="text/javascript" src="../../js/platform/first.js"></script> <script type="text/javascript" src="../../js/platform/first.js"></script>
@@ -78,11 +75,10 @@ a,button,input,label,i{
<p>アップデートがあります</p> <p>アップデートがあります</p>
<span id="now"></span>→<b id="ver"></b><br> <span id="now"></span>→<b id="ver"></b><br>
<span id="det"></span><br> <span id="det"></span><br>
<button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">インストーラー版(推奨)</button> <button class="waves-effect btn windows hide" onclick="update('install')" style="margin-left:15px;">インストーラー版(推奨)</button>
<button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">ポータブル版</button> <button class="waves-effect btn windows hide" onclick="update('portable')" style="margin-left:15px;">ポータブル版</button>
<span class="linux">snap版はSnapcraft等よりDLしてください。<br></span> <button class="waves-effect btn linux hide" onclick="update('linux')" style="margin-left:15px;">開始</button>
<button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">開始</button> <button class="waves-effect btn mac hide" onclick="update('mac')" style="margin-left:15px;">開始</button>
<button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">開始</button>
<br> <br>
問題が発生しますか？<br><a href="https://thedesk.top">公式HP</a>からダウンロードをお試しください。 問題が発生しますか？<br><a href="https://thedesk.top">公式HP</a>からダウンロードをお試しください。
</div> </div>
@@ -184,12 +180,12 @@ function verck(){
var remote=electron.remote; var remote=electron.remote;
var platform=remote.process.platform; var platform=remote.process.platform;
var bit=process.arch; var bit=process.arch;
if(platform=="linux"){ if(platform=="win32"){
$('.windows').hide() $('.windows').removeClass("hide")
$('.linux').show() }else if(platform=="linux"){
}else if(platform=="mac"){ $('.linux').removeClass("hide")
$('.windows').hide() }else if(platform=="darwin"){
$('.mac').show() $('.mac').removeClass("hide")
} }
var start="https://thedesk.top/ver.json"; var start="https://thedesk.top/ver.json";
fetch(start, { fetch(start, {

4
app/view/make/index.sample.html
View File

@@ -608,8 +608,8 @@ var tlid=0;
<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank"> <a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
{{EntySupport}} {{EntySupport}}
</a> </a>
<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://osushi.love/Cutls_P" target="_blank"> <a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
{{sendSushi}} {{PixivSupport}}
</a> </a>
<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank"> <a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
{{AWLSupport}} {{AWLSupport}}

1
app/view/make/language/index.en.json
View File

@@ -105,6 +105,7 @@
"supportme":"Support TheDesk!", "supportme":"Support TheDesk!",
"TheDeskDes":"TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!", "TheDeskDes":"TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!",
"EntySupport":"Support on Enty", "EntySupport":"Support on Enty",
"PixivSupport":"Support on Pixiv FANBOX",
"AWLSupport":"Amazon Wish List", "AWLSupport":"Amazon Wish List",
"SendAmazonGift1":"Give me Amazon Gift Card:", "SendAmazonGift1":"Give me Amazon Gift Card:",
"SendAmazonGift2":"", "SendAmazonGift2":"",

1
app/view/make/language/index.ja.json
View File

@@ -105,6 +105,7 @@
"supportme":"ご支援ください。", "supportme":"ご支援ください。",
"TheDeskDes":"TheDeskは営利目的ではないため、有料機能や広告は一切ありません。<br>皆様のあたたかいご支援のもとで製作されています。", "TheDeskDes":"TheDeskは営利目的ではないため、有料機能や広告は一切ありません。<br>皆様のあたたかいご支援のもとで製作されています。",
"EntySupport":"Entyで支援", "EntySupport":"Entyで支援",
"PixivSupport":"Pixiv FANBOXで支援",
"AWLSupport":"Amazonほしいものリスト", "AWLSupport":"Amazonほしいものリスト",
"SendAmazonGift1":"", "SendAmazonGift1":"",
"SendAmazonGift2":"にAmazonギフトカードを送る", "SendAmazonGift2":"にAmazonギフトカードを送る",

2
app/view/make/setting.sample.html
View File

@@ -350,10 +350,10 @@
<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>@@about@@</button> <button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>@@about@@</button>
<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>@@hp@@</a> <a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>@@hp@@</a>
<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>@@support@@(Enty)</a> <a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>@@support@@(Enty)</a>
<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>@@support@@(Pixiv FANBOX)</a>
<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>@@help@@/Docs(Constructing)</a> <a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>@@help@@/Docs(Constructing)</a>
<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a> <a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a> <a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
<a class="btn waves-effect red lighten-2" href="https://osushi.love/Cutls_P" target="_blank" style="width:100%; max-width:500px;"><img src="../../img/sushi.svg" class="left" width="25" style="padding-top:5px;">@@sushi@@</a>
<br> <br>
Kyash<br> Kyash<br>
<img src="../../img/kyash.png" width="100"><br> <img src="../../img/kyash.png" width="100"><br>

24
app/view/make/update.sample.html
View File

@@ -62,9 +62,6 @@ a,button,input,label,i{
#prog{ #prog{
font-size:200%; font-size:200%;
} }
.linux, .mac{
display:none;
}
</style> </style>
<script type="text/javascript" src="../../js/common/jquery.js"></script> <script type="text/javascript" src="../../js/common/jquery.js"></script>
<script type="text/javascript" src="../../js/platform/first.js"></script> <script type="text/javascript" src="../../js/platform/first.js"></script>
@@ -78,11 +75,10 @@ a,button,input,label,i{
<p>{{updatehere}}</p> <p>{{updatehere}}</p>
<span id="now"></span>→<b id="ver"></b><br> <span id="now"></span>→<b id="ver"></b><br>
<span id="det"></span><br> <span id="det"></span><br>
<button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">{{installer}}</button> <button class="waves-effect btn windows hide" onclick="update('install')" style="margin-left:15px;">{{installer}}</button>
<button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">{{portable}}</button> <button class="waves-effect btn windows hide" onclick="update('portable')" style="margin-left:15px;">{{portable}}</button>
<span class="linux">{{snap}}<br></span> <button class="waves-effect btn linux hide" onclick="update('linux')" style="margin-left:15px;">{{download}}</button>
<button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">{{download}}</button> <button class="waves-effect btn mac hide" onclick="update('mac')" style="margin-left:15px;">{{download}}</button>
<button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">{{download}}</button>
<br> <br>
{{problem1}}<br>{{problem2}} {{problem1}}<br>{{problem2}}
</div> </div>
@@ -184,12 +180,12 @@ function verck(){
var remote=electron.remote; var remote=electron.remote;
var platform=remote.process.platform; var platform=remote.process.platform;
var bit=process.arch; var bit=process.arch;
if(platform=="linux"){ if(platform=="win32"){
$('.windows').hide() $('.windows').removeClass("hide")
$('.linux').show() }else if(platform=="linux"){
}else if(platform=="mac"){ $('.linux').removeClass("hide")
$('.windows').hide() }else if(platform=="darwin"){
$('.mac').show() $('.mac').removeClass("hide")
} }
var start="https://thedesk.top/ver.json"; var start="https://thedesk.top/ver.json";
fetch(start, { fetch(start, {

6
app/view/ps/index.html
View File

@@ -32,7 +32,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver="Usamin (18.1.1)"; var ver="Usamin (18.1.2)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@@ -608,8 +608,8 @@ var tlid=0;
<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank"> <a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
crwdns475:0crwdne475:0 crwdns475:0crwdne475:0
</a> </a>
<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://osushi.love/Cutls_P" target="_blank"> <a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
crwdns479:0crwdne479:0 {{PixivSupport}}
</a> </a>
<a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank"> <a class="btn-share btn waves-effect waves-light blue" href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">
crwdns476:0crwdne476:0 crwdns476:0crwdne476:0

2
app/view/ps/setting.html
View File

@@ -350,10 +350,10 @@
<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>crwdns662:0crwdne662:0</button> <button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i class="material-icons left">info</i>crwdns662:0crwdne662:0</button>
<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>crwdns663:0crwdne663:0</a> <a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">web</i>crwdns663:0crwdne663:0</a>
<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Enty)</a> <a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Enty)</a>
<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2" style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Pixiv FANBOX)</a>
<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>crwdns665:0crwdne665:0/Docs(Constructing)</a> <a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i class="material-icons left">list</i>crwdns665:0crwdne665:0/Docs(Constructing)</a>
<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a> <a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a> <a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
<a class="btn waves-effect red lighten-2" href="https://osushi.love/Cutls_P" target="_blank" style="width:100%; max-width:500px;"><img src="../../img/sushi.svg" class="left" width="25" style="padding-top:5px;">crwdns666:0crwdne666:0</a>
<br> <br>
Kyash<br> Kyash<br>
<img src="../../img/kyash.png" width="100"><br> <img src="../../img/kyash.png" width="100"><br>

24
app/view/ps/update.html
View File

@@ -62,9 +62,6 @@ a,button,input,label,i{
#prog{ #prog{
font-size:200%; font-size:200%;
} }
.linux, .mac{
display:none;
}
</style> </style>
<script type="text/javascript" src="../../js/common/jquery.js"></script> <script type="text/javascript" src="../../js/common/jquery.js"></script>
<script type="text/javascript" src="../../js/platform/first.js"></script> <script type="text/javascript" src="../../js/platform/first.js"></script>
@@ -78,11 +75,10 @@ a,button,input,label,i{
<p>crwdns669:0crwdne669:0</p> <p>crwdns669:0crwdne669:0</p>
<span id="now"></span>→<b id="ver"></b><br> <span id="now"></span>→<b id="ver"></b><br>
<span id="det"></span><br> <span id="det"></span><br>
<button class="waves-effect btn windows" onclick="update('install')" style="margin-left:15px;">crwdns2382:0crwdne2382:0</button> <button class="waves-effect btn windows hide" onclick="update('install')" style="margin-left:15px;">crwdns2382:0crwdne2382:0</button>
<button class="waves-effect btn windows" onclick="update('portable')" style="margin-left:15px;">crwdns1950:0crwdne1950:0</button> <button class="waves-effect btn windows hide" onclick="update('portable')" style="margin-left:15px;">crwdns1950:0crwdne1950:0</button>
<span class="linux">crwdns2384:0crwdne2384:0<br></span> <button class="waves-effect btn linux hide" onclick="update('linux')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
<button class="waves-effect btn linux" onclick="update('linux')" style="margin-left:15px;">crwdns670:0crwdne670:0</button> <button class="waves-effect btn mac hide" onclick="update('mac')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
<button class="waves-effect btn mac" onclick="update('mac')" style="margin-left:15px;">crwdns670:0crwdne670:0</button>
<br> <br>
crwdns678:0crwdne678:0<br>crwdns679:0crwdne679:0 crwdns678:0crwdne678:0<br>crwdns679:0crwdne679:0
</div> </div>
@@ -184,12 +180,12 @@ function verck(){
var remote=electron.remote; var remote=electron.remote;
var platform=remote.process.platform; var platform=remote.process.platform;
var bit=process.arch; var bit=process.arch;
if(platform=="linux"){ if(platform=="win32"){
$('.windows').hide() $('.windows').removeClass("hide")
$('.linux').show() }else if(platform=="linux"){
}else if(platform=="mac"){ $('.linux').removeClass("hide")
$('.windows').hide() }else if(platform=="darwin"){
$('.mac').show() $('.mac').removeClass("hide")
} }
var start="https://thedesk.top/ver.json"; var start="https://thedesk.top/ver.json";
fetch(start, { fetch(start, {