From 20567e68a8cd28a20b1fbbf6784dbc54b1a09193 Mon Sep 17 00:00:00 2001 From: Denis Zheleztsov Date: Tue, 2 Jan 2018 15:41:18 +0300 Subject: [PATCH 1/2] Threads view initial --- filter.html | 2 + index.html | 4 +- js/helpers.js | 24 +++++++ js/js.cookie.js | 165 ++++++++++++++++++++++++++++++++++++++++++++++++ js/script.js | 12 ++-- js/threads.js | 33 +++++++++- 6 files changed, 232 insertions(+), 8 deletions(-) create mode 100644 js/helpers.js create mode 100644 js/js.cookie.js diff --git a/filter.html b/filter.html index 8d6caec..9b42ff2 100644 --- a/filter.html +++ b/filter.html @@ -6,6 +6,8 @@ + + diff --git a/index.html b/index.html index db28b7c..7b8a825 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,8 @@ + + @@ -24,7 +26,7 @@
-
+
Mode
diff --git a/js/helpers.js b/js/helpers.js new file mode 100644 index 0000000..55726f1 --- /dev/null +++ b/js/helpers.js @@ -0,0 +1,24 @@ +function bake_cookie(name, value) { + var echo = read_cookie("echo"); + var threads = read_cookie("threads"); + if (name != "echo") { + var cookie = ["echo=", echo, ';', "threads", '=', value, '; domain=.', window.location.host.toString(), '; path=/;'].join(''); + document.cookie = cookie; + } else if (threads) { + var cookie = ["echo=", value, ';', "threads", '=', threads, '; domain=.', window.location.host.toString(), '; path=/;'].join(''); + document.cookie = cookie; + } else { + console.log("Setting echoes " + value); + var cookie = ["echo=", value, ';', 'domain=.', window.location.host.toString(), '; path=/;'].join(''); + document.cookie = cookie; + } + console.log("Cookie: " + document.cookie); +} + +function read_cookie(name) { + var result = document.cookie.match(new RegExp(name + '=([^;]+)')); + if (result) { + result = result[1]; + } + return result; +} diff --git a/js/js.cookie.js b/js/js.cookie.js new file mode 100644 index 0000000..9a0945e --- /dev/null +++ b/js/js.cookie.js @@ -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 () {}); +})); diff --git a/js/script.js b/js/script.js index b776b7a..e360dd7 100644 --- a/js/script.js +++ b/js/script.js @@ -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) { @@ -70,7 +71,7 @@ $(function() { } } - $('#echoSelected').html("Выбранные эхи: " + document.cookie); + $('#echoSelected').html("Выбранные эхи: " + Cookies.get("echo")); $('#echoSelector').html(options); $('#echoCheckBox').html(checks); // $('#echoSelect').html(select); @@ -90,7 +91,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 +103,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) @@ -396,7 +397,8 @@ function requestBuildThread(msg, init) { } function clearFilter() { - document.cookie = ""; + Cookies.remove('echo'); + Cookies.remove('threads'); } function showMenu() { diff --git a/js/threads.js b/js/threads.js index 868db98..31ce621 100644 --- a/js/threads.js +++ b/js/threads.js @@ -1,8 +1,10 @@ var thread_html = ""; var top_id = ""; +var view_mode = false; $(function() { var jumpLocation = parseLocation(); + // Cleanup content if (jumpLocation['matched']) { // Cleanup content @@ -69,14 +71,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); } } @@ -92,6 +92,35 @@ function parseLocation() { } } +// Set cookie with v=threads +function toggleViewModeOn() { + Cookies.set("threads", "on"); +} + +// Remove cookie with v=threads +function toggleViewModeOff() { + Cookies.set("threads", "off"); +} + +function toggleViewMode() { + if (checkViewMode()) { + toggleViewModeOff(); + } else { + toggleViewModeOn(); + } +} + +// 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 + } +} + // Make message HTML function makeMessageHTML(msgItem) { var t = new Date(msgItem['date'] * 1000); From ae8748cf7c37bfdf795ceccb58fa9a4da4ce181e Mon Sep 17 00:00:00 2001 From: Denis Zheleztsov Date: Tue, 2 Jan 2018 22:22:01 +0300 Subject: [PATCH 2/2] Working threads mode --- css/style.css | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++ index.html | 59 +++++++++++++++++++++------------------- js/helpers.js | 48 ++++++++++++++++++--------------- js/script.js | 53 ++++++++++++++++++++++++++++++++---- js/threads.js | 30 --------------------- 5 files changed, 182 insertions(+), 83 deletions(-) diff --git a/css/style.css b/css/style.css index 1d0f4ae..f0f84c3 100644 --- a/css/style.css +++ b/css/style.css @@ -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; +} diff --git a/index.html b/index.html index 7b8a825..50d53c8 100644 --- a/index.html +++ b/index.html @@ -17,34 +17,39 @@ - - -
- -
- - - -
-
Mode
+ +
+ +
+ + + +
+
+
+
+ +
+
+ +
- -
- Настроить фильтр - Сбросить фильтр - FAQ - Статистика + +
+
- - -
- -
-
-
-
- -
- +
+ +
+ + + diff --git a/js/helpers.js b/js/helpers.js index 55726f1..5078886 100644 --- a/js/helpers.js +++ b/js/helpers.js @@ -1,24 +1,30 @@ -function bake_cookie(name, value) { - var echo = read_cookie("echo"); - var threads = read_cookie("threads"); - if (name != "echo") { - var cookie = ["echo=", echo, ';', "threads", '=', value, '; domain=.', window.location.host.toString(), '; path=/;'].join(''); - document.cookie = cookie; - } else if (threads) { - var cookie = ["echo=", value, ';', "threads", '=', threads, '; domain=.', window.location.host.toString(), '; path=/;'].join(''); - document.cookie = cookie; - } else { - console.log("Setting echoes " + value); - var cookie = ["echo=", value, ';', 'domain=.', window.location.host.toString(), '; path=/;'].join(''); - document.cookie = cookie; - } - console.log("Cookie: " + document.cookie); +// Set cookie with v=threads +function toggleViewModeOn() { + Cookies.set("threads", "on", {expires: 365}); } -function read_cookie(name) { - var result = document.cookie.match(new RegExp(name + '=([^;]+)')); - if (result) { - result = result[1]; - } - return result; +// 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 + } } diff --git a/js/script.js b/js/script.js index e360dd7..e46c124 100644 --- a/js/script.js +++ b/js/script.js @@ -23,8 +23,36 @@ if (hash.matched) { requestMessage(hash.hash); } +// Add checker to menu +function makeMenu() { + if (checkViewMode()) { + $("#dropdown-content").html( + `Threads mode + + Настроить фильтр + Сбросить фильтр + FAQ + Статистика`); + } else { + $("#dropdown-content").html( + `Threads mode + + Настроить фильтр + Сбросить фильтр + FAQ + Статистика`); + } +} + $(function() { + makeMenu(); //extentions $.ajax({ url:"https://dynamic.lessmore.pw/idec/x/features", @@ -148,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); } @@ -160,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); } @@ -314,14 +357,14 @@ function callback(messages) { } // Header - html += '

' + html += '

' + '' + msgItem['subg'] + '' + ' ' + msgItem['echo'] + '

' + '

' + msg.autoLink() + '

' - + // Msgid + '' + msgItem['msgid'] + ''; diff --git a/js/threads.js b/js/threads.js index 31ce621..592bae0 100644 --- a/js/threads.js +++ b/js/threads.js @@ -1,6 +1,5 @@ var thread_html = ""; var top_id = ""; -var view_mode = false; $(function() { var jumpLocation = parseLocation(); @@ -92,35 +91,6 @@ function parseLocation() { } } -// Set cookie with v=threads -function toggleViewModeOn() { - Cookies.set("threads", "on"); -} - -// Remove cookie with v=threads -function toggleViewModeOff() { - Cookies.set("threads", "off"); -} - -function toggleViewMode() { - if (checkViewMode()) { - toggleViewModeOff(); - } else { - toggleViewModeOn(); - } -} - -// 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 - } -} - // Make message HTML function makeMessageHTML(msgItem) { var t = new Date(msgItem['date'] * 1000);