From 7c0d68f2076cd341ccdd14b7ba8def2750b39fa0 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 22 Mar 2016 10:28:34 +0300 Subject: remove dismiss* functions --- js/tt-rss.js | 8 -------- js/viewfeed.js | 64 ---------------------------------------------------------- 2 files changed, 72 deletions(-) (limited to 'js') diff --git a/js/tt-rss.js b/js/tt-rss.js index 5261485ae..daba8f909 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -343,12 +343,6 @@ function init() { editArticleTags(id); }; } - hotkey_actions["dismiss_selected"] = function() { - dismissSelectedArticles(); - }; - hotkey_actions["dismiss_read"] = function() { - dismissReadArticles(); - }; hotkey_actions["open_in_new_window"] = function() { if (getActiveArticleId()) { openArticleInNewWindow(getActiveArticleId()); @@ -375,8 +369,6 @@ function init() { if (isCdmMode()) { if (!getInitParam("cdm_expanded")) { cdmCollapseArticle(false, getActiveArticleId()); - } else { - dismissArticle(getActiveArticleId()); } } else { closeArticlePanel(); diff --git a/js/viewfeed.js b/js/viewfeed.js index bd0e0690b..0b37c071f 100755 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -1631,70 +1631,6 @@ function show_labels_in_headlines(transport) { } } -function dismissArticles(ids) { - try { - - console.log("dismissArticles: " + ids); - - for (var i = 0; i < ids.length; i++) { - var elem = $("RROW-" + ids[i]); - - new Effect.Fade(elem, { - duration: 0.5, afterFinish: function (obj) { - Element.remove(obj.element); - } - }); - - if (ids[i] == getActiveArticleId()) { - setActiveArticleId(0); - } - } - - selectionToggleUnread(false, false, false, ids); - - } catch (e) { - exception_error("dismissArticles", e); - } - -} - -function dismissArticle(id) { - try { - dismissArticles([id]); - } catch (e) { - exception_error("dismissArticle", e); - } -} - -function dismissSelectedArticles() { - try { - dismissArticles(getSelectedArticleIds2()); - } catch (e) { - exception_error("dismissSelectedArticles", e); - } -} - -function dismissReadArticles() { - try { - var ids = getLoadedArticleIds(); - var tmp = []; - - ids.each(function(id) { - var elem = $("RROW-" + id); - - if (elem && !elem.hasClassName("Unread")) { - tmp.push(id); - } - - }); - - dismissArticles(tmp); - - } catch (e) { - exception_error("dismissReadArticles", e); - } -} - function cdmClicked(event, id) { try { //var shift_key = event.shiftKey; -- cgit v1.2.3