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

Fix messages link

Browse Source
This commit is contained in:
Denis Zheleztsov 2017-12-12 15:01:49 +03:00
parent bbf5057081
commit 0911cb050c
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
js/script.js
View File

@ -95,17 +95,19 @@ $(function() {
});
$('#echoSelector').on('change', function() {
echo = '';
html = '';
for (i in $(this).val()) {
echo += $(this).val()[i] + " ";
console.log($(this).val()[i]);
}
document.cookie = echo +"; path=/; expires=" + date.toUTCString();
requestEcho();
$('#echoSelected').html("Выбранные эхи: " + echo)
if (!hash.matched) {
echo = '';
html = '';
for (i in $(this).val()) {
echo += $(this).val()[i] + " ";
console.log($(this).val()[i]);
}
document.cookie = echo +"; path=/; expires=" + date.toUTCString();
requestEcho();
$('#echoSelected').html("Выбранные эхи: " + echo)
if (echo == "") requestEmptyEcho();
if (echo == "") requestEmptyEcho();
}
});
$('#searchInput').on('change', function() {
@ -117,10 +119,10 @@ $(function() {
$(window).scroll(function() {
hash = parseLocationHash();
// console.log($(document).height() - $(window).height()-$(window).scrollTop());
if ($(document).height() - $(window).height() - $(window).scrollTop() < 1.5 && !(hash.matched)) {
if ($(document).height() - $(window).height() - $(window).scrollTop() < 1.5 && !hash.matched) {
showMore();
//console.log($(document).height() - $(window).height() - $(window).scrollTop());
}
}
});
}) //end of .ready() method
@ -234,25 +236,25 @@ function searchRequest(data) {
function callbackHS(messages) {
var msgArray = messages["hits"]["hits"];
// console.log(msgArray);
if (msgArray.length == 1) {
// console.log(msgArray.length);
html += '<div class="hsMessage">';
} else {
single = 0;
}
for (hit in msgArray) {
hash = parseLocationHash();
var msgItem = msgArray[hit]['_source'];
var t = new Date(msgItem['date'] * 1000);
var msg = '';
if (hash.matched && msgItem['msgid'] == hash.hash) {
// // commentnsole.log(msgArray.length);
html += '<div class="hsMessage">';
}
// console.log(msgItem['date']);
// console.log(t);
var t_formatted = t.getFullYear() + "/" + (t.getMonth() + 1) + "/" + t.getDate() + " " + t.getHours() + ":" + t.getMinutes() + ":" + t.getSeconds();
// msg = msgItem['message'].replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(new RegExp("\n",'g'), "<br>\n");
if ('highlight' in msgArray[hit]) {
msg = msgArray[hit]['highlight']['message'][0].replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(new RegExp("\n",'g'), "<br>\n");
msg = msgArray[hit]['highlight']['message'][0].replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(new RegExp("\n",'g'), "<br>\n") + '...';
} else {
msg = msgItem['message'].replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(new RegExp("\n",'g'), "<br>\n");
}
@ -278,10 +280,10 @@ function callbackHS(messages) {
// Msgid
+ '<a href="?' + msgItem['msgid'] +'" onclick="requestMessage(\'' + msgItem['msgid'] + '\');"><i class="fa fa-link"></i>' + msgItem['msgid'] + '</a></p></div>';
}
if (msgArray.length == 1) {
html += '</div>';
console.log(html);
if (hash.matched && msgItem['msgid'] == hash.hash) {
html += '</div>';
}
}
}
@ -289,18 +291,18 @@ function callbackHS(messages) {
function callback(messages) {
var msgArray = messages["hits"]["hits"];
// console.log(msgArray);
if (msgArray.length == 1) {
// console.log(msgArray.length);
html += '<div class="hsMessage">';
}
for (hit in msgArray) {
hash = parseLocationHash();
var msgItem = msgArray[hit]['_source'];
var t = new Date(msgItem['date'] * 1000);
// console.log(msgItem['date']);
// console.log(t);
var t_formatted = t.getFullYear() + "/" + (t.getMonth() + 1) + "/" + t.getDate() + " " + t.getHours() + ":" + t.getMinutes() + ":" + t.getSeconds();
if (hash.matched && msgItem['msgid'] == hash.hash) {
html += '<div class="hsMessage">';
}
msg = msgItem['message'].replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(new RegExp("\n",'g'), "<br>\n");
@ -324,9 +326,10 @@ function callback(messages) {
// Msgid
+ '<a href="?' + msgItem['msgid'] +'" onclick="requestMessage(\'' + msgItem['msgid'] + '\');"><i class="fa fa-link"></i>' + msgItem['msgid'] + '</a></p></div>';
}
if (msgArray.length == 1) {
html += '</div>';
if (hash.matched && msgItem['msgid'] == hash.hash) {
html += '</div>';
}
}
}