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

TheDesk Miria (17.0.1)-beta2

Browse Source
This commit is contained in:
cutls 2019-01-29 10:49:14 +09:00
parent e3470ae0f2
commit 456500e954
6 changed files with 828 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ var lang={
//tl/notification.js
"lang_notf_new":" new notifications",
//tl/speech.js
"lang_speech_refresh":"Save valie about TTS config",
"lang_speech_refresh":"Save value about TTS config",
//tl/src.js
"lang_src_ts":"chronological order",
"lang_src_people":" people toot",

4
app/js/post/status.js
View File

@ -278,6 +278,10 @@ function redraft(id, acct_id){
localStorage.setItem("nohide",true);
show();
$("#textarea").val(html);
var cwtxt=$("[toot-id="+id+"] .cw_text").html();
cwtxt=$.strip_tags(cwtxt);
cw();
$("#cw-text").val(cwtxt);
}
}
//ピン留め

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

@ -356,7 +356,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
var locked = "";
}
if (!toot.application) {
var via = '<span style="font-style: italic;">Unknown</span>';
var via = '';
} else {
var via = toot.application.name;
//強調チェック
@ -666,7 +666,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
date(toot.created_at, datetype) + '</span>' +
'</div></div>' +
'<div class="area-toot">'+tickerdom+'<span class="' +
api_spoil + ' cw_text_' + toot.id + '">' + spoil + spoiler_show +
api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show +
'</span><span class="toot ' + spoiler + '">' + content +
'</span>' +
'' + viewer + '' +

825
app/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

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

@ -25,7 +25,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="Miria (17.0.1)-beta";
var ver="Miria (17.0.1)-beta2";
//betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta";

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

@ -25,7 +25,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="Miria (17.0.1)-beta";
var ver="Miria (17.0.1)-beta2";
//betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta";