valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove dismiss* functions

This commit is contained in:
Andrew Dolgov 2016-03-22 10:28:34 +03:00
parent a51bc3dfa5
commit 7c0d68f207
3 changed files with 0 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions2.php
View File

@ -64,8 +64,6 @@
"toggle_publ" => __("Toggle published"), "toggle_publ" => __("Toggle published"),
"toggle_unread" => __("Toggle unread"), "toggle_unread" => __("Toggle unread"),
"edit_tags" => __("Edit tags"), "edit_tags" => __("Edit tags"),
"dismiss_selected" => __("Dismiss selected"),
"dismiss_read" => __("Dismiss read"),
"open_in_new_window" => __("Open in new window"), "open_in_new_window" => __("Open in new window"),
"catchup_below" => __("Mark below as read"), "catchup_below" => __("Mark below as read"),
"catchup_above" => __("Mark above as read"), "catchup_above" => __("Mark above as read"),
@ -135,8 +133,6 @@
"*s" => "toggle_publ", "*s" => "toggle_publ",
"u" => "toggle_unread", "u" => "toggle_unread",
"*t" => "edit_tags", "*t" => "edit_tags",
"*d" => "dismiss_selected",
"*x" => "dismiss_read",
"o" => "open_in_new_window", "o" => "open_in_new_window",
"c p" => "catchup_below", "c p" => "catchup_below",
"c n" => "catchup_above", "c n" => "catchup_above",

8
js/tt-rss.js
View File

@ -343,12 +343,6 @@ function init() {
editArticleTags(id); editArticleTags(id);
}; };
} }
hotkey_actions["dismiss_selected"] = function() {
dismissSelectedArticles();
};
hotkey_actions["dismiss_read"] = function() {
dismissReadArticles();
};
hotkey_actions["open_in_new_window"] = function() { hotkey_actions["open_in_new_window"] = function() {
if (getActiveArticleId()) { if (getActiveArticleId()) {
openArticleInNewWindow(getActiveArticleId()); openArticleInNewWindow(getActiveArticleId());
@ -375,8 +369,6 @@ function init() {
if (isCdmMode()) { if (isCdmMode()) {
if (!getInitParam("cdm_expanded")) { if (!getInitParam("cdm_expanded")) {
cdmCollapseArticle(false, getActiveArticleId()); cdmCollapseArticle(false, getActiveArticleId());
} else {
dismissArticle(getActiveArticleId());
} }
} else { } else {
closeArticlePanel(); closeArticlePanel();

64
js/viewfeed.js
View File

@ -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) { function cdmClicked(event, id) {
try { try {
//var shift_key = event.shiftKey; //var shift_key = event.shiftKey;