Threads fixes
This commit is contained in:
parent
dd894787c7
commit
2f2268a308
|
@ -6,9 +6,12 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=0.7">
|
||||
<link rel="stylesheet" href="css/style.css">
|
||||
<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/threads.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">
|
||||
</head>
|
||||
<body>
|
||||
|
@ -16,9 +19,6 @@
|
|||
<div class="lessmore">
|
||||
<a id="menu" href="javascript:void(0)" onclick="showMenu()"><i class="fa fa-bars"></i></a>
|
||||
<div id="dropdown-content">
|
||||
<a href="/">На главную</a>
|
||||
<a href="/" onclick="clearFilter()">Сбросить фильтр</a>
|
||||
<a href="lessmorefaq.html">FAQ</a>
|
||||
</div>
|
||||
<a href = "/" style="text-decoration: none; color: #babdb6;"><u>dynamic</u> | <u>less</u></a>
|
||||
</div>
|
||||
|
|
24
js/script.js
24
js/script.js
|
@ -178,7 +178,17 @@ function requestEmptyEcho() {
|
|||
function requestEcho() {
|
||||
var data = '';
|
||||
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 {
|
||||
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() {
|
||||
var data = '';
|
||||
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 {
|
||||
data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"query_string" : {"fields": ["echo"], "query": "' + echo + '"}}, "size":' + show_rows + ', "from":' + from + '}';
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
var thread_html = "";
|
||||
var top_id = "";
|
||||
var answers = {};
|
||||
|
||||
$(function() {
|
||||
var jumpLocation = parseLocation();
|
||||
|
@ -67,10 +68,15 @@ function proccessThreadRequest(data, msgid) {
|
|||
})
|
||||
}
|
||||
|
||||
function answersRequest()
|
||||
|
||||
function proccessThread(msgid, callback) {
|
||||
data = '{"sort": [ { "date": { "order": "asc" }}, { "_score": { "order": "desc" }}], "query": {"query_string" : {"fields" : ["repto"], "query" :"' + msgid + '"}}, "size": 100 }';
|
||||
if (callback) {
|
||||
for (hit in callback["hits"]["hits"]) {
|
||||
if (top_id == callback["hits"]["hits"][hit]["_source"]) {
|
||||
answersRequest(top_id);
|
||||
}
|
||||
msg = callback["hits"]["hits"][hit]["_source"];
|
||||
thread_html += makeMessageHTML(callback["hits"]["hits"][0]["_source"]);
|
||||
proccessThread(msg["msgid"], false);
|
||||
|
|
Loading…
Reference in New Issue
Block a user