Merge branch 'threads' of lapus/dynamic into master

This commit is contained in:
Denis Zheleztsov 2018-01-02 22:23:39 +03:00 committed by Gitea
commit dd894787c7
7 changed files with 362 additions and 39 deletions

View File

@ -91,6 +91,12 @@ body {
padding: 10px
}
/* #dropdown-content>input { */
/* border:1px solid #eeeeec; */
/* display: block; */
/* padding: 10px */
/* } */
#faq {
margin: 80px 0 0;
}
@ -164,3 +170,72 @@ body {
/* The switch - the box around the slider */
.switch {
position: relative;
display: inline-block;
width: 40px;
height: 24px;
}
/* Hide default HTML checkbox */
.switch input {display:none;}
/* The slider */
.slider {
position: absolute;
cursor: pointer;
top: 2pt;
left: 0;
right: 0;
bottom: 0;
background-color: #ccc;
-webkit-transition: .4s;
transition: .4s;
}
.slider:before {
position: absolute;
content: "";
height: 19px;
width: 19px;
left: 2px;
bottom: 2px;
background-color: white;
-webkit-transition: .4s;
transition: .4s;
}
input:checked + .slider {
background-color: #2196F3;
}
input:focus + .slider {
box-shadow: 0 0 1px #2196F3;
}
input:checked + .slider:before {
-webkit-transform: translateX(20px);
-ms-transform: translateX(20px);
transform: translateX(20px);
}
/* Rounded sliders */
.slider.round {
border-radius: 14px;
}
.slider.round:before {
border-radius: 50%;
}
#preloader {
position: fixed;
left: 0;
top: 0;
z-index: 999;
width: 100%;
height: 100%;
overflow: visible;
background: #2E3436 url('/img/preload.gif') no-repeat center center;
}

View File

@ -6,6 +6,8 @@
<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/helpers.js"></script>
<script src="js/threads.js"></script>
<script src="js/script.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
</head>

View File

@ -9,40 +9,47 @@
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<!-- <script src="js/jquery-1.8.min.js"></script> -->
<script src="js/multiple-select.js"></script>
<script src="js/js.cookie.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>
<div class="threadView" id="thread"></div>
<div class="lessmore">
<a id="searchButton" href="javascript:void(0)" onclick="showSearch()"><i class="fa fa-search"></i></a>
<!-- <div class="logo"><a href="/" style="text-decoration: none; color: #c9c9c9;">dynamic | less</a></div> -->
<input type="search" id="searchInput" placeholder="Example: python">
<div id="selector">
<form><a href="/" style="text-decoration: none; color: #c9c9c9;"><i id="siteIcon" class="fa fa-sitemap" ></i> </a> <select id="echoSelector" multiple size="5"></select></form>
<body>
<div class="threadView" id="thread"></div>
<div class="lessmore">
<a id="searchButton" href="javascript:void(0)" onclick="showSearch()"><i class="fa fa-search"></i></a>
<!-- <div class="logo"><a href="/" style="text-decoration: none; color: #c9c9c9;">dynamic | less</a></div> -->
<input type="search" id="searchInput" placeholder="Example: python">
<div id="selector">
<form><a href="/" style="text-decoration: none; color: #c9c9c9;"><i id="siteIcon" class="fa fa-sitemap" ></i> </a> <select id="echoSelector" multiple size="5"></select>
</form>
</div>
<a id="menu" href="javascript:void(0)" onclick="showMenu()"><i class="fa fa-bars"></i></a>
<div id="dropdown-content">
</div>
<!-- <form><select id="echoSelector" multiple size="5"></select></form> -->
<!-- <a href="/" id="logo" style="text-decoration: none; color: #c9c9c9;">dynamic | less</a> -->
</div>
<a id="menu" href="javascript:void(0)" onclick="showMenu()"><i class="fa fa-bars"></i></a>
<div id="dropdown-content">
<a href="filter.html">Настроить фильтр</a>
<a href="" onclick="clearFilter()">Сбросить фильтр</a>
<a href="lessmorefaq.html">FAQ</a>
<a href="stats.html">Статистика</a>
<div class="content">
<div id="mes"></div>
</div>
<!-- <form><select id="echoSelector" multiple size="5"></select></form> -->
<!-- <a href="/" id="logo" style="text-decoration: none; color: #c9c9c9;">dynamic | less</a> -->
</div>
<div class="content">
<div id="mes"></div>
</div>
<div id="preloader" align="center">
<img src="/img/preload.gif" onclick="showMore()" height="20em">
</div>
</body>
<div id="preloader" align="center" onclick="showMore()">
<!-- <img src="/img/preload.gif" onclick="showMore()" height="20em"> -->
</div>
<script>
jQuery(document).ready(function($) {
$(window).load(function() {
setTimeout(function() {
$('#preloader').fadeOut('slow', function() {});
}, 2000);
});});
</script>
</body>
</html>

30
js/helpers.js Normal file
View File

@ -0,0 +1,30 @@
// Set cookie with v=threads
function toggleViewModeOn() {
Cookies.set("threads", "on", {expires: 365});
}
// Remove cookie with v=threads
function toggleViewModeOff() {
Cookies.set("threads", "off", {expires: 365});
}
function toggleViewMode() {
if (checkViewMode()) {
toggleViewModeOff();
location.reload();
} else {
toggleViewModeOn();
location.reload();
}
}
// Check view mode
function checkViewMode() {
if (Cookies.get("threads") && Cookies.get("threads") == "on") {
console.log('THREADS ON');
return true
} else {
console.log('NORMAL');
return false
}
}

165
js/js.cookie.js Normal file
View File

@ -0,0 +1,165 @@
/*!
* JavaScript Cookie v2.2.0
* https://github.com/js-cookie/js-cookie
*
* Copyright 2006, 2015 Klaus Hartl & Fagner Brack
* Released under the MIT license
*/
;(function (factory) {
var registeredInModuleLoader = false;
if (typeof define === 'function' && define.amd) {
define(factory);
registeredInModuleLoader = true;
}
if (typeof exports === 'object') {
module.exports = factory();
registeredInModuleLoader = true;
}
if (!registeredInModuleLoader) {
var OldCookies = window.Cookies;
var api = window.Cookies = factory();
api.noConflict = function () {
window.Cookies = OldCookies;
return api;
};
}
}(function () {
function extend () {
var i = 0;
var result = {};
for (; i < arguments.length; i++) {
var attributes = arguments[ i ];
for (var key in attributes) {
result[key] = attributes[key];
}
}
return result;
}
function init (converter) {
function api (key, value, attributes) {
var result;
if (typeof document === 'undefined') {
return;
}
// Write
if (arguments.length > 1) {
attributes = extend({
path: '/'
}, api.defaults, attributes);
if (typeof attributes.expires === 'number') {
var expires = new Date();
expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
attributes.expires = expires;
}
// We're using "expires" because "max-age" is not supported by IE
attributes.expires = attributes.expires ? attributes.expires.toUTCString() : '';
try {
result = JSON.stringify(value);
if (/^[\{\[]/.test(result)) {
value = result;
}
} catch (e) {}
if (!converter.write) {
value = encodeURIComponent(String(value))
.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
} else {
value = converter.write(value, key);
}
key = encodeURIComponent(String(key));
key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
key = key.replace(/[\(\)]/g, escape);
var stringifiedAttributes = '';
for (var attributeName in attributes) {
if (!attributes[attributeName]) {
continue;
}
stringifiedAttributes += '; ' + attributeName;
if (attributes[attributeName] === true) {
continue;
}
stringifiedAttributes += '=' + attributes[attributeName];
}
return (document.cookie = key + '=' + value + stringifiedAttributes);
}
// Read
if (!key) {
result = {};
}
// To prevent the for loop in the first place assign an empty array
// in case there are no cookies at all. Also prevents odd result when
// calling "get()"
var cookies = document.cookie ? document.cookie.split('; ') : [];
var rdecode = /(%[0-9A-Z]{2})+/g;
var i = 0;
for (; i < cookies.length; i++) {
var parts = cookies[i].split('=');
var cookie = parts.slice(1).join('=');
if (!this.json && cookie.charAt(0) === '"') {
cookie = cookie.slice(1, -1);
}
try {
var name = parts[0].replace(rdecode, decodeURIComponent);
cookie = converter.read ?
converter.read(cookie, name) : converter(cookie, name) ||
cookie.replace(rdecode, decodeURIComponent);
if (this.json) {
try {
cookie = JSON.parse(cookie);
} catch (e) {}
}
if (key === name) {
result = cookie;
break;
}
if (!key) {
result[name] = cookie;
}
} catch (e) {}
}
return result;
}
api.set = api;
api.get = function (key) {
return api.call(api, key);
};
api.getJSON = function () {
return api.apply({
json: true
}, [].slice.call(arguments));
};
api.defaults = {};
api.remove = function (key, attributes) {
api(key, '', extend(attributes, {
expires: -1
}));
};
api.withConverter = init;
return api;
}
return init(function () {});
}));

View File

@ -14,7 +14,8 @@ var thread = '';
//var date = new Date(new Date().getTime() + 60 * 1000);
var date = new Date;
date.setDate(date.getDate() + 7);
var echo = document.cookie;
var echo = Cookies.get('echo');
console.log(echo);
hash = parseLocationHash();
if (hash.matched) {
@ -22,8 +23,36 @@ if (hash.matched) {
requestMessage(hash.hash);
}
// Add checker to menu
function makeMenu() {
if (checkViewMode()) {
$("#dropdown-content").html(
`<a style="text-decoration:none !important;" href="javascript:void(0)">Threads mode <label class="switch">
<input id="threadsCheckbox" type="checkbox" onclick="toggleViewMode()" checked>
<span class="slider round"></span>
</label>
</a>
<a href="filter.html">Настроить фильтр</a>
<a href="" onclick="clearFilter()">Сбросить фильтр</a>
<a href="lessmorefaq.html">FAQ</a>
<a href="stats.html">Статистика</a>`);
} else {
$("#dropdown-content").html(
`<a style="text-decoration:none !important;" href="javascript:void(0)">Threads mode <label class="switch">
<input id="threadsCheckbox" type="checkbox" onclick="toggleViewMode()">
<span class="slider round"></span>
</label>
</a>
<a href="filter.html">Настроить фильтр</a>
<a href="" onclick="clearFilter()">Сбросить фильтр</a>
<a href="lessmorefaq.html">FAQ</a>
<a href="stats.html">Статистика</a>`);
}
}
$(function() {
makeMenu();
//extentions
$.ajax({
url:"https://dynamic.lessmore.pw/idec/x/features",
@ -70,7 +99,7 @@ $(function() {
}
}
$('#echoSelected').html("Выбранные эхи: " + document.cookie);
$('#echoSelected').html("Выбранные эхи: " + Cookies.get("echo"));
$('#echoSelector').html(options);
$('#echoCheckBox').html(checks);
// $('#echoSelect').html(select);
@ -90,7 +119,7 @@ $(function() {
echo = '';
for (var i=0; i<$("input[type=checkbox]:checked").length; i++) {
echo += $("input[type=checkbox]:checked")[i]["defaultValue"] + " ";}
document.cookie = echo +"; path=/; expires=" + date.toUTCString();
Cookies.set("echo", echo, {expires: 7});
$('#echoSelected').html("Выбранные эхи: " + echo);
});
@ -102,7 +131,7 @@ $(function() {
echo += $(this).val()[i] + " ";
console.log($(this).val()[i]);
}
document.cookie = echo +"; path=/; expires=" + date.toUTCString();
Cookies.set("echo", echo, {expires: 7});
requestEcho();
$('#echoSelected').html("Выбранные эхи: " + echo)
@ -147,7 +176,12 @@ function requestEmptyEcho() {
}
function requestEcho() {
var data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"query_string" : {"fields": ["echo"], "query": "' + echo + '"}}, "size":' + 5 + '}';
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}';
} else {
data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"query_string" : {"fields": ["echo"], "query": "' + echo + '"}}, "size":' + 5 + '}';
}
ajaxRequest(data);
}
@ -159,13 +193,23 @@ function requestTmpEcho(e) {
}
function requestEmptyEchoOffset() {
var data = '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}],"size":'+ show_rows + ', "from":'+ from + '}';
var data = '';
if (checkViewMode()) {
data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": { "query_string" : {"fields": ["repto"], "query": "repto.keyword:\\"\\""}}, "size":' + show_rows + ', "from":' + from + '}';
} else {
data = '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}],"size":'+ show_rows + ', "from":'+ from + '}';
}
ajaxRequest(data);
}
function requestEchoOffset() {
var data = '{"sort": [ { "date": { "order": "desc" }}, { "_score": { "order": "desc" }}], "query": {"query_string" : {"fields" : ["echo"], "query" :"' + echo + '"}}, "size":'+ show_rows + ', "from":'+ from + '}';
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 + '}';
} else {
data = '{"sort": [{"date": {"order": "desc"}}, {"_score": { "order": "desc" }}], "query": {"query_string" : {"fields": ["echo"], "query": "' + echo + '"}}, "size":' + show_rows + ', "from":' + from + '}';
}
ajaxRequest(data);
}
@ -313,14 +357,14 @@ function callback(messages) {
}
// Header
html += ' <p style="color:#0099cc;font: 1.5em Open Sans, sans-serif;">'
html += ' <p style="color:#0099cc;font: 1.5em Open Sans, sans-serif;">'
+ '<a class="headerLink" href="/?j=' + msgItem['msgid'] + '">'
+ msgItem['subg'] + '</a>'
+ ' <i class="fa fa-at"></i> <i><a class="headerLink" href="javascript:void(0)" onclick="requestTmpEcho(\'' + msgItem['echo'] + '\')">' + msgItem['echo']
+ '</a></i></p></p>'
+ '<p>' + msg.autoLink()
+ '</p><p align="right">'
// Msgid
+ '<a href="?' + msgItem['msgid'] +'" onclick="requestMessage(\'' + msgItem['msgid'] + '\');"><i class="fa fa-link"></i>' + msgItem['msgid'] + '</a>';
@ -396,7 +440,8 @@ function requestBuildThread(msg, init) {
}
function clearFilter() {
document.cookie = "";
Cookies.remove('echo');
Cookies.remove('threads');
}
function showMenu() {

View File

@ -3,6 +3,7 @@ var top_id = "";
$(function() {
var jumpLocation = parseLocation();
// Cleanup content
if (jumpLocation['matched']) {
// Cleanup content
@ -69,14 +70,12 @@ function proccessThreadRequest(data, msgid) {
function proccessThread(msgid, callback) {
data = '{"sort": [ { "date": { "order": "asc" }}, { "_score": { "order": "desc" }}], "query": {"query_string" : {"fields" : ["repto"], "query" :"' + msgid + '"}}, "size": 100 }';
if (callback) {
console.log(callback);
for (hit in callback["hits"]["hits"]) {
msg = callback["hits"]["hits"][hit]["_source"];
thread_html += makeMessageHTML(callback["hits"]["hits"][0]["_source"]);
proccessThread(msg["msgid"], false);
}
} else {
console.log(data);
proccessThreadRequest(data, msgid);
}
}