From 70fa4230268a422d0b7eef1ea223ca5cc1c14646 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 Feb 2021 21:51:18 +0300 Subject: initial for RIP prototype/scriptaculous --- js/tt-rss.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'js/tt-rss.js') diff --git a/js/tt-rss.js b/js/tt-rss.js index 764667a0d..28b598c25 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -70,13 +70,20 @@ require(["dojo/_base/kernel", /* exported hash_get */ function hash_get(key) { - const kv = window.location.hash.substring(1).toQueryParams(); - return kv[key]; + console.warn("FIXME: hash_get", key); + + //const kv = window.location.hash.substring(1).toQueryParams(); + //return kv[key]; + console.warn("FIXME: hash_get", key); } /* exported hash_set */ function hash_set(key, value) { - const kv = window.location.hash.substring(1).toQueryParams(); + console.warn("FIXME: hash_set", key, value); + + /*const kv = window.location.hash.substring(1).toQueryParams(); kv[key] = value; - window.location.hash = $H(kv).toQueryString(); + window.location.hash = $H(kv).toQueryString();*/ + + console.warn("FIXME: hash_set", key); } -- cgit v1.2.3 From 5475eed4526c099b0139a896963d5bf94a389a4a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 06:35:37 +0300 Subject: bring back hash functions --- js/tt-rss.js | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'js/tt-rss.js') diff --git a/js/tt-rss.js b/js/tt-rss.js index 28b598c25..a00838c43 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -70,20 +70,13 @@ require(["dojo/_base/kernel", /* exported hash_get */ function hash_get(key) { - console.warn("FIXME: hash_get", key); - - //const kv = window.location.hash.substring(1).toQueryParams(); - //return kv[key]; - console.warn("FIXME: hash_get", key); + const obj = dojo.queryToObject(window.location.hash.substring(1)); + return obj[key]; } /* exported hash_set */ function hash_set(key, value) { - console.warn("FIXME: hash_set", key, value); - - /*const kv = window.location.hash.substring(1).toQueryParams(); - kv[key] = value; - window.location.hash = $H(kv).toQueryString();*/ - - console.warn("FIXME: hash_set", key); + const obj = dojo.queryToObject(window.location.hash.substring(1)); + obj[key] = value; + window.location.hash = dojo.objectToQuery(obj); } -- cgit v1.2.3 From bec35200e97adabf4880a92bad40ec5bbe4848d1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Feb 2021 07:29:21 +0300 Subject: fix some eslint-related stuff --- js/tt-rss.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/tt-rss.js') diff --git a/js/tt-rss.js b/js/tt-rss.js index a00838c43..8d7dd00a6 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -1,6 +1,6 @@ 'use strict' -/* global require, App, $H */ +/* global require, App, dojo */ /* exported Plugins */ const Plugins = {}; -- cgit v1.2.3 From 810afdaf5a429468d31b09ae5a7f995dd11568f8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 21 Feb 2021 12:28:25 +0300 Subject: prevent creation of filter rules matching no feeds --- js/tt-rss.js | 1 + 1 file changed, 1 insertion(+) (limited to 'js/tt-rss.js') diff --git a/js/tt-rss.js b/js/tt-rss.js index 8d7dd00a6..4a7f2e643 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -51,6 +51,7 @@ require(["dojo/_base/kernel", "fox/FeedTree", "fox/Toolbar", "fox/SingleUseDialog", + "fox/form/ValidationMultiSelect", "fox/form/ValidationTextArea", "fox/form/Select", "fox/form/ComboButton", -- cgit v1.2.3