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

Fix: moreLoading

Browse Source
This commit is contained in:
Cutls 2019-06-21 23:17:56 +09:00
parent 37695735e0
commit 9d2eb6f18b
8 changed files with 84 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,7 +183,7 @@ function block(acct_id) {
} }
//ミュート //ミュート
function mute(acct_id) { function muteDo(acct_id) {
if (!acct_id) { if (!acct_id) {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
} }

68
app/js/tl/misskeyparse.js
View File

@ -50,14 +50,14 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
native = "yes"; native = "yes";
} }
//クライアント強調 //クライアント強調
var emp = localStorage.getItem("client_emp"); var empCli = localStorage.getItem("client_emp");
if (emp) { if (empCli) {
var emp = JSON.parse(emp); var empCli = JSON.parse(empCli);
} }
//クライアントミュート //クライアントミュート
var mute = localStorage.getItem("client_mute"); var muteCli = localStorage.getItem("client_mute");
if (mute) { if (muteCli) {
var mute = JSON.parse(mute); var muteCli = JSON.parse(muteCli);
} }
//ユーザー強調 //ユーザー強調
var useremp = localStorage.getItem("user_emp"); var useremp = localStorage.getItem("user_emp");
@ -65,17 +65,19 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
var useremp = JSON.parse(useremp); var useremp = JSON.parse(useremp);
} }
//ワード強調 //ワード強調
var wordemp = localStorage.getItem("word_emp"); var wordempList = localStorage.getItem("word_emp");
if (wordemp) { if (wordempList) {
var wordemp = JSON.parse(wordemp); var wordempList = JSON.parse(wordempList);
} }
//ワードミュート //ワードミュート
var wordmute = localStorage.getItem("word_mute"); var wordmuteList = localStorage.getItem("word_mute");
if (wordmute) { if (wordmuteList) {
var wordmute = JSON.parse(wordmute); var wordmuteList = JSON.parse(wordmuteList);
wordmute = wordmute.concat(mutefilter); if (wordmuteList) {
wordmuteList = wordmuteList.concat(mutefilter);
}
} else { } else {
wordmute = mutefilter; wordmuteList = mutefilter;
} }
//Ticker //Ticker
var tickerck = localStorage.getItem("ticker_ok"); var tickerck = localStorage.getItem("ticker_ok");
@ -349,16 +351,16 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
viashow = "via-hide"; viashow = "via-hide";
} }
//強調チェック //強調チェック
Object.keys(emp).forEach(function (key6) { Object.keys(empCli).forEach(function (key6) {
var cli = emp[key6]; var empCliList = empCli[key6];
if (cli == via) { if (empCliList == via) {
boostback = "emphasized"; boostback = "emphasized";
} }
}); });
//ミュートチェック //ミュートチェック
Object.keys(mute).forEach(function (key7) { Object.keys(muteCli).forEach(function (key7) {
var cli = mute[key7]; var muteCliList = muteCli[key7];
if (cli == via) { if (muteCliList == via) {
boostback = "hide"; boostback = "hide";
} }
}); });
@ -581,16 +583,16 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
//アバター //アバター
var avatar = toot.user.avatarUrl; var avatar = toot.user.avatarUrl;
//ワードミュート //ワードミュート
if (wordmute) { if (wordmuteList) {
Object.keys(wordmute).forEach(function (key8) { Object.keys(wordmuteList).forEach(function (key8) {
var worde = wordmute[key8]; var worde = wordmuteList[key8];
if (worde) { if (worde) {
if (worde.tag) { if (worde.tag) {
var word = worde.tag; var wordList = worde.tag;
} else { } else {
var word = worde var wordList = worde
} }
var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g"); var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
if ($.strip_tagstemp(content).match(regExp)) { if ($.strip_tagstemp(content).match(regExp)) {
boostback = "hide by_filter"; boostback = "hide by_filter";
} }
@ -598,13 +600,13 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
}); });
} }
//ワード強調 //ワード強調
if (wordemp) { if (wordempList) {
Object.keys(wordemp).forEach(function (key9) { Object.keys(wordempList).forEach(function (key9) {
var word = wordemp[key9]; var wordList = wordempList[key9];
if (word) { if (wordList) {
var word = word.tag; var wordList = wordList.tag;
var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g"); var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
content = content.replace(regExp, '<span class="emp">' + word + "</span>"); content = content.replace(regExp, '<span class="emp">' + wordList + "</span>");
} }
}); });
} }

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

@ -52,14 +52,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
native = "yes"; native = "yes";
} }
//クライアント強調 //クライアント強調
var emp = localStorage.getItem("client_emp"); var empCli = localStorage.getItem("client_emp");
if (emp) { if (empCli) {
var emp = JSON.parse(emp); var empCli = JSON.parse(empCli);
} }
//クライアントミュート //クライアントミュート
var mute = localStorage.getItem("client_mute"); var muteCli = localStorage.getItem("client_mute");
if (mute) { if (muteCli) {
var mute = JSON.parse(mute); var muteCli = JSON.parse(muteCli);
} }
//ユーザー強調 //ユーザー強調
var useremp = localStorage.getItem("user_emp"); var useremp = localStorage.getItem("user_emp");
@ -67,17 +67,19 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
var useremp = JSON.parse(useremp); var useremp = JSON.parse(useremp);
} }
//ワード強調 //ワード強調
var wordemp = localStorage.getItem("word_emp"); var wordempList = localStorage.getItem("word_emp");
if (wordemp) { if (wordempList) {
var wordemp = JSON.parse(wordemp); var wordempList = JSON.parse(wordempList);
} }
//ワードミュート //ワードミュート
var wordmute = localStorage.getItem("word_mute"); var wordmuteList = localStorage.getItem("word_mute");
if (wordmute) { if (wordmuteList) {
var wordmute = JSON.parse(wordmute); var wordmuteList = JSON.parse(wordmuteList);
wordmute = wordmute.concat(mutefilter); if (wordmuteList) {
wordmuteList = wordmuteList.concat(mutefilter);
}
} else { } else {
wordmute = mutefilter; wordmuteList = mutefilter;
} }
//Ticker //Ticker
var tickerck = localStorage.getItem("ticker_ok"); var tickerck = localStorage.getItem("ticker_ok");
@ -431,16 +433,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
} else { } else {
var via = escapeHTML(toot.application.name); var via = escapeHTML(toot.application.name);
//強調チェック //強調チェック
Object.keys(emp).forEach(function (key6) { Object.keys(empCli).forEach(function (key6) {
var cli = emp[key6]; var empCliList = empCli[key6];
if (cli == via) { if (empCliList == via) {
boostback = "emphasized"; boostback = "emphasized";
} }
}); });
//ミュートチェック //ミュートチェック
Object.keys(mute).forEach(function (key7) { Object.keys(muteCli).forEach(function (key7) {
var cli = mute[key7]; var muteCliList = muteCli[key7];
if (cli == via) { if (muteCliList == via) {
boostback = "hide"; boostback = "hide";
} }
}); });
@ -724,17 +726,17 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
var avatar = toot.account.avatar_static; var avatar = toot.account.avatar_static;
} }
//ワードミュート //ワードミュート
if (wordmute) { if (wordmuteList) {
Object.keys(wordmute).forEach(function (key8) { Object.keys(wordmuteList).forEach(function (key8) {
var worde = wordmute[key8]; var worde = wordmuteList[key8];
console.log(worde)
if (worde) { if (worde) {
if (worde.tag) { if (worde.tag) {
var word = worde.tag; var wordList = worde.tag;
} else { } else {
var word = worde var wordList = worde
} }
var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g"); var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
console.log(regExp)
if ($.strip_tags(content).match(regExp)) { if ($.strip_tags(content).match(regExp)) {
boostback = "hide by_filter"; boostback = "hide by_filter";
} }
@ -742,13 +744,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
}); });
} }
//ワード強調 //ワード強調
if (wordemp) { if (wordempList) {
Object.keys(wordemp).forEach(function (key9) { Object.keys(wordempList).forEach(function (key9) {
var word = wordemp[key9]; var wordList = wordempList[key9];
if (word) { if (wordList) {
var word = word.tag; var wordList = wordList.tag;
var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g"); var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
content = content.replace(regExp, '<span class="emp">' + word + "</span>"); content = content.replace(regExp, '<span class="emp">' + wordList + "</span>");
} }
}); });
} }

5
app/js/tl/tl.js
View File

@ -425,6 +425,11 @@ function moreload(type, tlid) {
todo(error); todo(error);
console.error(error); console.error(error);
}).then(function (json) { }).then(function (json) {
if (localStorage.getItem("filter_" + acct_id) != "undefined") {
var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
} else {
var mute = [];
}
if (misskey) { if (misskey) {
var templete = misskeyParse(json, '', acct_id, tlid, "", mute); var templete = misskeyParse(json, '', acct_id, tlid, "", mute);
} else { } else {

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

@ -36,7 +36,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.6.1)"; var ver = "Usamin (18.6.2)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -622,7 +622,7 @@
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn"
onclick="follow()">Follow</a> onclick="follow()">Follow</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn"
onclick="mute()">Mute</a> onclick="muteDo()">Mute</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn"
onclick="block()">Block</a> onclick="block()">Block</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">Close</a> <a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">Close</a>

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

@ -36,7 +36,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.6.1)"; var ver = "Usamin (18.6.2)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -622,7 +622,7 @@
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn"
onclick="follow()">フォロー</a> onclick="follow()">フォロー</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn"
onclick="mute()">ミュート</a> onclick="muteDo()">ミュート</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn"
onclick="block()">ブロック</a> onclick="block()">ブロック</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">Close</a> <a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">Close</a>

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

@ -622,7 +622,7 @@
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn"
onclick="follow()">@@follow@@</a> onclick="follow()">@@follow@@</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn"
onclick="mute()">@@mute@@</a> onclick="muteDo()">@@mute@@</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn"
onclick="block()">@@block@@</a> onclick="block()">@@block@@</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">@@close@@</a> <a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">@@close@@</a>

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

@ -36,7 +36,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.6.1)"; var ver = "Usamin (18.6.2)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -622,7 +622,7 @@
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn"
onclick="follow()">crwdns440:0crwdne440:0</a> onclick="follow()">crwdns440:0crwdne440:0</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn"
onclick="mute()">crwdns449:0crwdne449:0</a> onclick="muteDo()">crwdns449:0crwdne449:0</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn" <a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn"
onclick="block()">crwdns448:0crwdne448:0</a> onclick="block()">crwdns448:0crwdne448:0</a>
<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">crwdns385:0crwdne385:0</a> <a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">crwdns385:0crwdne385:0</a>