lapus/dynamic
lapus/dynamic
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Threads fixes

Browse Source
This commit is contained in:
Denis Zheleztsov 2018-01-03 15:00:52 +03:00
parent dd894787c7
commit 2f2268a308
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
filter.html
View File

@ -6,9 +6,12 @@
<meta name="viewport" content="width=device-width, initial-scale=0.7"> <meta name="viewport" content="width=device-width, initial-scale=0.7">
<link rel="stylesheet" href="css/style.css"> <link rel="stylesheet" href="css/style.css">
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script> <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="js/js.cookie.js"></script>
<script src="js/multiple-select.js"></script>
<script src="js/helpers.js"></script> <script src="js/helpers.js"></script>
<script src="js/threads.js"></script> <script src="js/threads.js"></script>
<script src="js/script.js"></script> <script src="js/script.js"></script>
<script src="js/autolink.js"></Script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
</head> </head>
<body> <body>
@ -16,9 +19,6 @@
<div class="lessmore"> <div class="lessmore">
<a id="menu" href="javascript:void(0)" onclick="showMenu()"><i class="fa fa-bars"></i></a> <a id="menu" href="javascript:void(0)" onclick="showMenu()"><i class="fa fa-bars"></i></a>
<div id="dropdown-content"> <div id="dropdown-content">
<a href="/">На главную</a>
<a href="/" onclick="clearFilter()">Сбросить фильтр</a>
<a href="lessmorefaq.html">FAQ</a>
</div> </div>
<a href = "/" style="text-decoration: none; color: #babdb6;"><u>dynamic</u> | <u>less</u></a> <a href = "/" style="text-decoration: none; color: #babdb6;"><u>dynamic</u> | <u>less</u></a>
</div> </div>

24
js/script.js
View File

@ -178,7 +178,17 @@ function requestEmptyEcho() {
function requestEcho() { function requestEcho() {
var data = ''; var data = '';
if (checkViewMode()) { if (checkViewMode()) {
data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"bool": { "must": [ { "query_string" : {"fields": ["echo", "repto"], "query": "' + echo +' AND repto.keyword:\\"\\""}}]}}, "size":5}'; var echoes = '(';
for (e in echo.split(" ")) {
if (echo.split(" ")[e] != "") {
echoes += "echo:" + echo.split(" ")[e];
}
if (e < echo.split(" ").length - 2) {
echoes += " OR ";
}
}
echoes += ')';
data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"bool": { "must": [ { "query_string" : {"fields": ["echo", "repto"], "query": "' + echoes +' AND repto.keyword:\\"\\""}}]}}, "size":5}';
} else { } else {
data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"query_string" : {"fields": ["echo"], "query": "' + echo + '"}}, "size":' + 5 + '}'; data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"query_string" : {"fields": ["echo"], "query": "' + echo + '"}}, "size":' + 5 + '}';
} }
@ -206,7 +216,17 @@ function requestEmptyEchoOffset() {
function requestEchoOffset() { function requestEchoOffset() {
var data = ''; var data = '';
if (checkViewMode()) { if (checkViewMode()) {
data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"bool": { "must": [ { "query_string" : {"fields": ["echo", "repto"], "query": "' + echo +' AND repto.keyword:\\"\\""}}]}}, "size":' + show_rows + ', "from":' + from + '}'; var echoes = '(';
for (e in echo.split(" ")) {
if (echo.split(" ")[e] != "") {
echoes += "echo:" + echo.split(" ")[e];
}
if (e < echo.split(" ").length - 2) {
echoes += " OR ";
}
}
echoes += ')';
data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"bool": { "must": [ { "query_string" : {"fields": ["echo", "repto"], "query": "' + echoes +' AND repto.keyword:\\"\\""}}]}}, "size":' + show_rows + ', "from":' + from + '}';
} else { } else {
data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"query_string" : {"fields": ["echo"], "query": "' + echo + '"}}, "size":' + show_rows + ', "from":' + from + '}'; data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"query_string" : {"fields": ["echo"], "query": "' + echo + '"}}, "size":' + show_rows + ', "from":' + from + '}';
} }

6
js/threads.js
View File

@ -1,5 +1,6 @@
var thread_html = ""; var thread_html = "";
var top_id = ""; var top_id = "";
var answers = {};
$(function() { $(function() {
var jumpLocation = parseLocation(); var jumpLocation = parseLocation();
@ -67,10 +68,15 @@ function proccessThreadRequest(data, msgid) {
}) })
} }
function answersRequest()
function proccessThread(msgid, callback) { function proccessThread(msgid, callback) {
data = '{"sort": [ { "date": { "order": "asc" }}, { "_score": { "order": "desc" }}], "query": {"query_string" : {"fields" : ["repto"], "query" :"' + msgid + '"}}, "size": 100 }'; data = '{"sort": [ { "date": { "order": "asc" }}, { "_score": { "order": "desc" }}], "query": {"query_string" : {"fields" : ["repto"], "query" :"' + msgid + '"}}, "size": 100 }';
if (callback) { if (callback) {
for (hit in callback["hits"]["hits"]) { for (hit in callback["hits"]["hits"]) {
if (top_id == callback["hits"]["hits"][hit]["_source"]) {
answersRequest(top_id);
}
msg = callback["hits"]["hits"][hit]["_source"]; msg = callback["hits"]["hits"][hit]["_source"];
thread_html += makeMessageHTML(callback["hits"]["hits"][0]["_source"]); thread_html += makeMessageHTML(callback["hits"]["hits"][0]["_source"]);
proccessThread(msg["msgid"], false); proccessThread(msg["msgid"], false);