From 0a18d0b1edb208e5811c419a1119d131b7041173 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 2 Dec 2018 08:57:22 +0300 Subject: Feeds: shorten some method names finally rename "view as rss" --- js/functions.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'js/functions.js') diff --git a/js/functions.js b/js/functions.js index a3b257979..df7a33831 100755 --- a/js/functions.js +++ b/js/functions.js @@ -699,9 +699,9 @@ const CommonDialogs = { if (App.isPrefs()) { Feeds.reload(); } else { - if (feed_id == Feeds.getActiveFeedId()) + if (feed_id == Feeds.getActive()) setTimeout(() => { - Feeds.viewfeed({feed: -5}) + Feeds.open({feed: -5}) }, 100); @@ -1351,7 +1351,7 @@ const Filters = { if (!App.isPrefs()) { query = { op: "pref-filters", method: "newfilter", - feed: Feeds.getActiveFeedId(), is_cat: Feeds.activeFeedIsCat() + feed: Feeds.getActive(), is_cat: Feeds.activeIsCat() }; } else { query = {op: "pref-filters", method: "newfilter"}; @@ -1445,8 +1445,8 @@ const Filters = { if (selectedText != "") { - const feed_id = Feeds.activeFeedIsCat() ? 'CAT:' + parseInt(Feeds.getActiveFeedId()) : - Feeds.getActiveFeedId(); + const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) : + Feeds.getActive(); const rule = {reg_exp: selectedText, feed_id: [feed_id], filter_type: 1}; @@ -1463,12 +1463,12 @@ const Filters = { if (reply && reply.title) title = reply.title; - if (title || Feeds.getActiveFeedId() || Feeds.activeFeedIsCat()) { + if (title || Feeds.getActive() || Feeds.activeIsCat()) { - console.log(title + " " + Feeds.getActiveFeedId()); + console.log(title + " " + Feeds.getActive()); - const feed_id = Feeds.activeFeedIsCat() ? 'CAT:' + parseInt(Feeds.getActiveFeedId()) : - Feeds.getActiveFeedId(); + const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) : + Feeds.getActive(); const rule = {reg_exp: title, feed_id: [feed_id], filter_type: 1}; -- cgit v1.2.3