js: misc code cleanup, handle ctrl-clicking on postContent
This commit is contained in:
Andrew Dolgov
parent
8624dec2db
commit
6e88da8223
401
feedlist.js
401
feedlist.js
|
|
@ -1,31 +1,12 @@
|
|||
var _feed_cur_page = 0;
|
||||
var _infscroll_disable = 0;
|
||||
var _infscroll_request_sent = 0;
|
||||
var feed_under_pointer = undefined;
|
||||
|
||||
var counter_timeout_id = false;
|
||||
|
||||
var resize_enabled = false;
|
||||
var selection_disabled = false;
|
||||
var counters_last_request = 0;
|
||||
|
||||
var feeds_sort_by_unread = false;
|
||||
var feedlist_sortable_enabled = false;
|
||||
|
||||
function toggle_sortable_feedlist(enabled) {
|
||||
/* try {
|
||||
|
||||
if (enabled) {
|
||||
Sortable.create('feedList', {onChange: feedlist_dragsorted, only: "feedCat"});
|
||||
} else {
|
||||
Sortable.destroy('feedList');
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
exception_error("toggle_sortable_feedlist", e);
|
||||
} */
|
||||
}
|
||||
|
||||
function viewCategory(cat) {
|
||||
viewfeed(cat, '', true);
|
||||
return false;
|
||||
|
|
@ -133,46 +114,7 @@ function viewfeed(feed, subop, is_cat, offset) {
|
|||
var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
|
||||
|
||||
if (show_next_feed) {
|
||||
|
||||
if (!activeFeedIsCat()) {
|
||||
|
||||
var feedlist = $('feedList');
|
||||
|
||||
var next_unread_feed = getRelativeFeedId2(feed, false,
|
||||
"next", true);
|
||||
|
||||
/* gRFI2 also returns categories which we don't really
|
||||
* need here, so we skip them */
|
||||
|
||||
while (next_unread_feed && next_unread_feed.match("CAT:"))
|
||||
next_unread_feed = getRelativeFeedId2(
|
||||
next_unread_feed.replace("CAT:", ""),
|
||||
true, "next", true);
|
||||
|
||||
if (!next_unread_feed) {
|
||||
next_unread_feed = getRelativeFeedId2(-3, true,
|
||||
"next", true);
|
||||
}
|
||||
|
||||
if (next_unread_feed) {
|
||||
query = query + "&nuf=" + param_escape(next_unread_feed);
|
||||
//setActiveFeedId(next_unread_feed);
|
||||
feed = next_unread_feed;
|
||||
}
|
||||
} else {
|
||||
|
||||
var next_unread_feed = getNextUnreadCat(feed);
|
||||
|
||||
/* we don't need to specify that our next feed is actually
|
||||
a category, because we're in the is_cat mode by definition
|
||||
already */
|
||||
|
||||
if (next_unread_feed && show_next_feed) {
|
||||
query = query + "&nuf=" + param_escape(next_unread_feed);
|
||||
feed = next_unread_feed;
|
||||
}
|
||||
|
||||
}
|
||||
// TODO: implement show_next_feed handling
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -197,7 +139,7 @@ function viewfeed(feed, subop, is_cat, offset) {
|
|||
|
||||
var unread_ctr = -1;
|
||||
|
||||
if (!is_cat) unread_ctr = get_feed_unread(feed);
|
||||
if (!is_cat) unread_ctr = getFeedUnread(feed);
|
||||
|
||||
var cache_check = false;
|
||||
|
||||
|
|
@ -244,31 +186,6 @@ function viewfeed(feed, subop, is_cat, offset) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
function feedlist_dragsorted(ctr) {
|
||||
try {
|
||||
var cats = $$("#feedList > li[id*=FCAT-]");
|
||||
var ordered_cats = [];
|
||||
|
||||
cats.each(function(cat) {
|
||||
ordered_cats.push(cat.id.replace("FCAT-", ""));
|
||||
});
|
||||
|
||||
if (ordered_cats.length > 0) {
|
||||
|
||||
var query = "?op=feeds&subop=catsort&corder=" +
|
||||
param_escape(ordered_cats.toString());
|
||||
|
||||
//console.log(query);
|
||||
|
||||
new Ajax.Request("backend.php", { parameters: query });
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
exception_error("feedlist_dragsorted", e);
|
||||
}
|
||||
}
|
||||
|
||||
function feedlist_init() {
|
||||
try {
|
||||
loading_set_progress(90);
|
||||
|
|
@ -279,10 +196,7 @@ function feedlist_init() {
|
|||
document.onkeydown = hotkey_handler;
|
||||
setTimeout("hotkey_prefix_timeout()", 5*1000);
|
||||
|
||||
if (getActiveFeedId()) {
|
||||
//console.log("some feed is open on feedlist refresh, reloading");
|
||||
//setTimeout("viewCurrentFeed()", 100);
|
||||
} else {
|
||||
if (!getActiveFeedId()) {
|
||||
if (getInitParam("cdm_auto_catchup") != 1) {
|
||||
setTimeout("viewfeed(-3)", 100);
|
||||
} else {
|
||||
|
|
@ -292,9 +206,8 @@ function feedlist_init() {
|
|||
}
|
||||
|
||||
console.log("T:" +
|
||||
getInitParam("cdm_auto_catchup") + " " + get_feed_unread(-3));
|
||||
getInitParam("cdm_auto_catchup") + " " + getFeedUnread(-3));
|
||||
|
||||
toggle_sortable_feedlist(isFeedlistSortable());
|
||||
hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
|
||||
|
||||
} catch (e) {
|
||||
|
|
@ -302,14 +215,6 @@ function feedlist_init() {
|
|||
}
|
||||
}
|
||||
|
||||
function enable_selection(b) {
|
||||
selection_disabled = !b;
|
||||
}
|
||||
|
||||
function enable_resize(b) {
|
||||
resize_enabled = b;
|
||||
}
|
||||
|
||||
function request_counters_real() {
|
||||
try {
|
||||
console.log("requesting counters...");
|
||||
|
|
@ -392,7 +297,6 @@ function parse_counters(reply, scheduled_call) {
|
|||
var has_img = elems[l].has_img;
|
||||
var updated = elems[l].updated;
|
||||
var title = elems[l].title;
|
||||
var xmsg = elems[l].xmsg;
|
||||
|
||||
if (id == "global-unread") {
|
||||
global_unread = ctr;
|
||||
|
|
@ -407,6 +311,10 @@ function parse_counters(reply, scheduled_call) {
|
|||
|
||||
var treeItem;
|
||||
|
||||
if (id == getActiveFeedId() && ctr > getFeedUnread(id) && scheduled_call) {
|
||||
displayNewContentPrompt(id);
|
||||
}
|
||||
|
||||
setFeedUnread(id, (kind == "cat"), ctr);
|
||||
|
||||
if (kind != "cat") {
|
||||
|
|
@ -442,16 +350,9 @@ function parse_counters(reply, scheduled_call) {
|
|||
}
|
||||
}
|
||||
|
||||
function get_feed_unread(feed, is_cat) {
|
||||
function getFeedUnread(feed, is_cat) {
|
||||
try {
|
||||
if (is_cat)
|
||||
treeItem = treeModel.store._itemsByIdentity['CAT:' + feed];
|
||||
else
|
||||
treeItem = treeModel.store._itemsByIdentity['FEED:' + feed];
|
||||
|
||||
if (treeItem)
|
||||
return treeModel.store.getValue(treeItem, 'unread');
|
||||
|
||||
return parseInt(getFeedValue(feed, is_cat, 'unread'));
|
||||
} catch (e) {
|
||||
//
|
||||
}
|
||||
|
|
@ -459,89 +360,8 @@ function get_feed_unread(feed, is_cat) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
function get_cat_unread(id) {
|
||||
return get_feed_unread(id, true);
|
||||
}
|
||||
|
||||
function get_feed_entry_unread(elem) {
|
||||
|
||||
var id = elem.id.replace("FEEDR-", "");
|
||||
|
||||
if (id <= 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
try {
|
||||
return parseInt($("FEEDU-" + id).innerHTML);
|
||||
} catch (e) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
function get_feed_entry_name(elem) {
|
||||
var id = elem.id.replace("FEEDR-", "");
|
||||
return getFeedName(id);
|
||||
}
|
||||
|
||||
|
||||
function resort_category(node, cat_mode) {
|
||||
|
||||
try {
|
||||
|
||||
//console.log("resort_category: " + node + " CM=" + cat_mode);
|
||||
|
||||
var by_unread = feedsSortByUnread();
|
||||
|
||||
var list = node.getElementsByTagName("LI");
|
||||
|
||||
for (i = 0; i < list.length; i++) {
|
||||
|
||||
for (j = i+1; j < list.length; j++) {
|
||||
|
||||
var tmp_val = get_feed_entry_unread(list[i]);
|
||||
var cur_val = get_feed_entry_unread(list[j]);
|
||||
|
||||
//console.log(list[i].id + " vs " + list[j].id);
|
||||
|
||||
var tmp_name = get_feed_entry_name(list[i]).toLowerCase();
|
||||
var cur_name = get_feed_entry_name(list[j]).toLowerCase();
|
||||
|
||||
/* we don't want to match FEEDR-0 - e.g. Archived articles */
|
||||
|
||||
var valid_pair = cat_mode || (list[i].id.match(/FEEDR-[1-9]/) &&
|
||||
list[j].id.match(/FEEDR-[1-9]/));
|
||||
|
||||
if (valid_pair && ((by_unread && (cur_val > tmp_val)) || (!by_unread && (cur_name < tmp_name)))) {
|
||||
tempnode_i = list[i].cloneNode(true);
|
||||
tempnode_j = list[j].cloneNode(true);
|
||||
node.replaceChild(tempnode_i, list[j]);
|
||||
node.replaceChild(tempnode_j, list[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
exception_error("resort_category", e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function resort_feedlist() {
|
||||
return;
|
||||
|
||||
console.log("resort_feedlist");
|
||||
|
||||
if ($("FCATLIST--1")) {
|
||||
|
||||
var lists = $$("#feedList ul[id*=FCATLIST]");
|
||||
|
||||
lists.each(function(list) {
|
||||
if (list.id != "FCATLIST--1") resort_category(list, true);
|
||||
});
|
||||
|
||||
} else {
|
||||
resort_category($("feedList"), false);
|
||||
}
|
||||
console.warn("resort_feedlist: function not implemented");
|
||||
}
|
||||
|
||||
function hideOrShowFeeds(hide) {
|
||||
|
|
@ -561,7 +381,7 @@ function hideOrShowFeeds(hide) {
|
|||
var bare_id = parseInt(id.substr(id.indexOf(":")+1));
|
||||
|
||||
if (node) {
|
||||
var check_unread = get_feed_unread(bare_id, true);
|
||||
var check_unread = getFeedUnread(bare_id, true);
|
||||
|
||||
if (hide && cat_unread == 0 && check_unread == 0) {
|
||||
Effect.Fade(node[0].rowNode, {duration : 0.3,
|
||||
|
|
@ -577,92 +397,36 @@ function hideOrShowFeeds(hide) {
|
|||
} else {
|
||||
hideOrShowFeedsCategory(tree.model.store._arrayOfTopLevelItems, hide);
|
||||
}
|
||||
|
||||
/* try {
|
||||
|
||||
if ($("FCATLIST--1")) {
|
||||
|
||||
var lists = $$("#feedList ul[id*=FCATLIST]");
|
||||
|
||||
lists.each(function(list) {
|
||||
hideOrShowFeedsCategory(list.id.replace("FCATLIST-", ""), hide);
|
||||
});
|
||||
|
||||
} else {
|
||||
hideOrShowFeedsCategory(null, hide);
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
exception_error("hideOrShowFeeds", e);
|
||||
} */
|
||||
}
|
||||
|
||||
function hideOrShowFeedsCategory(feeds, hide) {
|
||||
try {
|
||||
//console.warn("hideOrShowFeedsCategory: function not implemented");
|
||||
var tree = dijit.byId("feedTree");
|
||||
|
||||
if (!tree) return;
|
||||
|
||||
var cat_unread = 0;
|
||||
|
||||
feeds.each(function(feed) {
|
||||
var id = String(feed.id);
|
||||
var bare_id = parseInt(id.substr(id.indexOf(":")+1));
|
||||
|
||||
var unread = feed.unread[0];
|
||||
var node = tree._itemNodesMap[id];
|
||||
|
||||
if (node) {
|
||||
if (hide && unread == 0 && (bare_id > 0 || !getInitParam("hide_read_shows_special"))) {
|
||||
Effect.Fade(node[0].rowNode, {duration : 0.3,
|
||||
queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
|
||||
} else {
|
||||
Element.show(node[0].rowNode);
|
||||
++cat_unread;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return cat_unread;
|
||||
|
||||
/* var nodes;
|
||||
var cat_node;
|
||||
|
||||
if (cat_id) {
|
||||
nodes = $$("#FCATLIST-" + cat_id + " > li");
|
||||
cat_node = $("FCAT-" + cat_id);
|
||||
} else {
|
||||
nodes = $$("#feedList li");
|
||||
}
|
||||
var tree = dijit.byId("feedTree");
|
||||
|
||||
if (!tree) return;
|
||||
|
||||
var cat_unread = 0;
|
||||
|
||||
nodes.each(function(node) {
|
||||
|
||||
var is_unread = node.hasClassName("Unread") ||
|
||||
node.hasClassName("Selected") ||
|
||||
(node.hasClassName("virt") &&
|
||||
getInitParam("hide_read_shows_special"));
|
||||
|
||||
if (hide && !is_unread) {
|
||||
Effect.Fade(node, {duration : 0.3,
|
||||
queue: { position: 'end', scope: 'FFADE-' + node.id, limit: 1 }});
|
||||
} else {
|
||||
Element.show(node);
|
||||
++cat_unread;
|
||||
|
||||
feeds.each(function(feed) {
|
||||
var id = String(feed.id);
|
||||
var bare_id = parseInt(id.substr(id.indexOf(":")+1));
|
||||
|
||||
var unread = feed.unread[0];
|
||||
var node = tree._itemNodesMap[id];
|
||||
|
||||
if (node) {
|
||||
if (hide && unread == 0 && (bare_id > 0 || !getInitParam("hide_read_shows_special"))) {
|
||||
Effect.Fade(node[0].rowNode, {duration : 0.3,
|
||||
queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
|
||||
} else {
|
||||
Element.show(node[0].rowNode);
|
||||
++cat_unread;
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
if (cat_node) {
|
||||
if (hide && cat_unread == 0 && !cat_node.hasClassName("Selected")) {
|
||||
Effect.Fade(cat_node, {duration : 0.3,
|
||||
queue: { position: 'end', scope: 'CFADE-' + cat_node.id, limit: 1 }});
|
||||
} else {
|
||||
Element.show(cat_node);
|
||||
}
|
||||
} */
|
||||
|
||||
return cat_unread;
|
||||
|
||||
} catch (e) {
|
||||
exception_error("hideOrShowFeedsCategory", e);
|
||||
|
|
@ -691,105 +455,6 @@ function getFeedValue(feed, is_cat, key) {
|
|||
return '';
|
||||
}
|
||||
|
||||
function getNextUnreadCat(id) {
|
||||
try {
|
||||
var rows = $$("#feedList li[id*=FCAT]");
|
||||
var unread_cats = [];
|
||||
|
||||
rows.each(function(row) {
|
||||
var cat_id = row.id.replace("FCAT-", "");
|
||||
|
||||
if (Element.visible(row) && get_cat_unread(cat_id) > 0)
|
||||
unread_cats.push(parseInt(cat_id));
|
||||
});
|
||||
|
||||
console.log(unread_cats);
|
||||
|
||||
var idx = unread_cats.indexOf(id);
|
||||
|
||||
if (idx != -1 && idx < unread_cats.length-1) {
|
||||
return unread_cats[idx+1];
|
||||
} else {
|
||||
return unread_cats[0];
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
exception_error("getNextUnreadCat", e);
|
||||
}
|
||||
}
|
||||
|
||||
function getRelativeFeedId2(id, is_cat, direction, unread_only) {
|
||||
try {
|
||||
|
||||
// alert(id + " IC: " + is_cat + " D: " + direction + " U: " + unread_only);
|
||||
|
||||
var rows = $$("#feedList li");
|
||||
var feeds = new Array();
|
||||
|
||||
for (var i = 0; i < rows.length; i++) {
|
||||
if (rows[i].id.match("FEEDR-")) {
|
||||
|
||||
if (rows[i].id == "FEEDR-" + id && !is_cat || (Element.visible(rows[i]) && Element.visible(rows[i].parentNode))) {
|
||||
|
||||
if (!unread_only ||
|
||||
(rows[i].hasClassName("Unread") || rows[i].id == "FEEDR-" + id)) {
|
||||
feeds.push(rows[i].id.replace("FEEDR-", ""));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (rows[i].id.match("FCAT-")) {
|
||||
if (rows[i].id == "FCAT-" + id && is_cat || (Element.visible(rows[i]) && Element.visible(rows[i].parentNode))) {
|
||||
|
||||
var cat_id = parseInt(rows[i].id.replace("FCAT-", ""));
|
||||
|
||||
if (cat_id >= 0) {
|
||||
if (!unread_only || get_cat_unread(cat_id) > 0) {
|
||||
feeds.push("CAT:"+cat_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// alert(feeds.toString());
|
||||
|
||||
if (!id) {
|
||||
if (direction == "next") {
|
||||
return feeds.shift();
|
||||
} else {
|
||||
return feeds.pop();
|
||||
}
|
||||
} else {
|
||||
if (direction == "next") {
|
||||
if (is_cat) id = "CAT:" + id;
|
||||
var idx = feeds.indexOf(id);
|
||||
if (idx != -1 && idx < feeds.length) {
|
||||
return feeds[idx+1];
|
||||
} else {
|
||||
return getRelativeFeedId2(false, is_cat, direction, unread_only);
|
||||
}
|
||||
} else {
|
||||
if (is_cat) id = "CAT:" + id;
|
||||
var idx = feeds.indexOf(id);
|
||||
if (idx > 0) {
|
||||
return feeds[idx-1];
|
||||
} else {
|
||||
return getRelativeFeedId2(false, is_cat, direction, unread_only);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
exception_error("getRelativeFeedId2", e);
|
||||
}
|
||||
}
|
||||
|
||||
function feedsSortByUnread() {
|
||||
return feeds_sort_by_unread;
|
||||
}
|
||||
|
||||
function setFeedUnread(feed, is_cat, unread) {
|
||||
try {
|
||||
setFeedValue(feed, is_cat, 'unread', parseInt(unread));
|
||||
|
|
|
|||
|
|
@ -574,8 +574,6 @@ function subscribeToFeed() {
|
|||
new Ajax.Request("backend.php", {
|
||||
parameters: query,
|
||||
onComplete: function(transport) {
|
||||
//dlg_frefresh_callback(transport);
|
||||
|
||||
try {
|
||||
|
||||
if (!transport.responseXML) {
|
||||
|
|
|
|||
|
|
@ -4599,7 +4599,9 @@
|
|||
truncate_string(strip_tags($line['title']), 15) . "</div>";
|
||||
|
||||
print "<div class=\"postReply\" id=\"POST-$id\">";
|
||||
print "<div class=\"postHeader\">";
|
||||
print "<div
|
||||
onclick=\"return postClicked(event, $id)\"
|
||||
class=\"postHeader\">";
|
||||
|
||||
$entry_author = $line["author"];
|
||||
|
||||
|
|
@ -4613,8 +4615,9 @@
|
|||
print "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
|
||||
|
||||
if ($line["link"]) {
|
||||
print "<div clear='both'><a target='_blank' href=\"" . $line["link"] . "\">" .
|
||||
$line["title"] . "</a><span class='author'>$entry_author</span></div>";
|
||||
print "<div clear='both'><a target='_blank' href=\"" .
|
||||
$line["link"] . "\">" .
|
||||
$line["title"] . "<span class='author'>$entry_author</span></a></div>";
|
||||
} else {
|
||||
print "<div clear='both'>" . $line["title"] . "$entry_author</div>";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<h2><?php echo __("Navigation") ?></h2>
|
||||
|
||||
<table>
|
||||
<tr><td class='n'>j/k</td><td><?php echo __("Move between feeds") ?></td></tr>
|
||||
<!-- <tr><td class='n'>j/k</td><td><?php echo __("Move between feeds") ?></td></tr> -->
|
||||
<tr><td class='n'>n/p</td><td><?php echo __("Move between articles") ?></td></tr>
|
||||
<tr><td class='n'>/</td><td><?php echo __("Show search dialog") ?></td></tr>
|
||||
</table>
|
||||
|
|
@ -46,8 +46,7 @@
|
|||
<tr><td class='n'>f a</td><td><?php echo __("(Un)hide read feeds") ?></td></tr>
|
||||
<tr><td class='n'>f s</td><td><?php echo __("Subscribe to feed") ?></td></tr>
|
||||
<tr><td class='n'>f e</td><td><?php echo __("Edit feed") ?></td></tr>
|
||||
<tr><td class='n'>f w</td><td><?php echo __("Sort by name or unread count") ?></td></tr>
|
||||
<!-- <tr><td class='n'>f h</td><td><?php echo __("Hide visible read articles") ?></td></tr> -->
|
||||
<!-- <tr><td class='n'>f w</td><td><?php echo __("Sort by name or unread count") ?></td></tr> -->
|
||||
<tr><td class='n'>f q</td><td><?php echo __("Mark feed as read") ?></td></tr>
|
||||
<tr><td class='n'>f x</td><td><?php echo __("Reverse headlines order") ?></td></tr>
|
||||
<tr><td class='n'>Q</td><td><?php echo __("Mark all feeds as read") ?></td></tr>
|
||||
|
|
|
|||
90
tt-rss.js
90
tt-rss.js
|
|
@ -51,14 +51,6 @@ function setActiveFeedId(id, is_cat) {
|
|||
}
|
||||
|
||||
|
||||
function isFeedlistSortable() {
|
||||
return feedlist_sortable_enabled;
|
||||
}
|
||||
|
||||
function tagsAreDisplayed() {
|
||||
return false;
|
||||
}
|
||||
|
||||
function dlg_frefresh_callback(transport, deleted_feed) {
|
||||
if (getActiveFeedId() == deleted_feed) {
|
||||
setTimeout("viewfeed(-5)", 100);
|
||||
|
|
@ -429,38 +421,6 @@ function quickMenuGo(opid) {
|
|||
Effect.Appear("hotkey_help_overlay", {duration : 0.3});
|
||||
}
|
||||
|
||||
if (opid == "qmcResetUI") {
|
||||
alert("Function not implemented");
|
||||
}
|
||||
|
||||
/* if (opid == "qmcToggleReorder") {
|
||||
feedlist_sortable_enabled = !feedlist_sortable_enabled;
|
||||
|
||||
if (feedlist_sortable_enabled) {
|
||||
notify_info("Category reordering enabled");
|
||||
toggle_sortable_feedlist(true);
|
||||
} else {
|
||||
notify_info("Category reordering disabled");
|
||||
toggle_sortable_feedlist(false);
|
||||
}
|
||||
} */
|
||||
|
||||
if (opid == "qmcResetCats") {
|
||||
|
||||
if (confirm(__("Reset category order?"))) {
|
||||
|
||||
var query = "?op=feeds&subop=catsortreset";
|
||||
|
||||
notify_progress("Loading, please wait...", true);
|
||||
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: query,
|
||||
onComplete: function(transport) {
|
||||
window.setTimeout('updateFeedList()', 50);
|
||||
} });
|
||||
}
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
exception_error("quickMenuGo", e);
|
||||
}
|
||||
|
|
@ -785,7 +745,6 @@ function hotkey_handler(e) {
|
|||
|
||||
if ((keycode == 191 || keychar == '?') && shift_key) { // ?
|
||||
if (!Element.visible("hotkey_help_overlay")) {
|
||||
//Element.show("hotkey_help_overlay");
|
||||
Effect.Appear("hotkey_help_overlay", {duration : 0.3});
|
||||
} else {
|
||||
Element.hide("hotkey_help_overlay");
|
||||
|
|
@ -801,40 +760,13 @@ function hotkey_handler(e) {
|
|||
return false;
|
||||
}
|
||||
|
||||
/* if (keycode == 82 && shift_key) { // R
|
||||
scheduleFeedUpdate(true);
|
||||
return;
|
||||
} */
|
||||
|
||||
if (keycode == 74) { // j
|
||||
var feed = getActiveFeedId();
|
||||
var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'prev');
|
||||
// alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
|
||||
if (new_feed) {
|
||||
var is_cat = new_feed.match("CAT:");
|
||||
if (is_cat) {
|
||||
new_feed = new_feed.replace("CAT:", "");
|
||||
viewCategory(new_feed);
|
||||
} else {
|
||||
viewfeed(new_feed, '', false);
|
||||
}
|
||||
}
|
||||
// TODO: move to previous feed
|
||||
return;
|
||||
}
|
||||
|
||||
if (keycode == 75) { // k
|
||||
var feed = getActiveFeedId();
|
||||
var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'next');
|
||||
// alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
|
||||
if (new_feed) {
|
||||
var is_cat = new_feed.match("CAT:");
|
||||
if (is_cat == "CAT:") {
|
||||
new_feed = new_feed.replace("CAT:", "");
|
||||
viewCategory(new_feed);
|
||||
} else {
|
||||
viewfeed(new_feed, '', false);
|
||||
}
|
||||
}
|
||||
// TODO: move to next feed
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -963,11 +895,6 @@ function hotkey_handler(e) {
|
|||
return false;
|
||||
}
|
||||
|
||||
/* if (keycode == 85 && shift_key) { // U
|
||||
scheduleFeedUpdate(true);
|
||||
return false;
|
||||
} */
|
||||
|
||||
if (keycode == 85) { // u
|
||||
if (getActiveFeedId()) {
|
||||
viewfeed(getActiveFeedId(), "ForceUpdate");
|
||||
|
|
@ -1034,14 +961,8 @@ function hotkey_handler(e) {
|
|||
}
|
||||
|
||||
if (keycode == 77) { // m
|
||||
feedlist_sortable_enabled = !feedlist_sortable_enabled;
|
||||
if (feedlist_sortable_enabled) {
|
||||
notify_info("Category reordering enabled");
|
||||
toggle_sortable_feedlist(true);
|
||||
} else {
|
||||
notify_info("Category reordering disabled");
|
||||
toggle_sortable_feedlist(false);
|
||||
}
|
||||
// TODO: sortable feedlist
|
||||
return;
|
||||
}
|
||||
|
||||
if (keycode == 78) { // n
|
||||
|
|
@ -1177,9 +1098,6 @@ function handle_rpc_reply(transport, scheduled_call) {
|
|||
if (runtime_info)
|
||||
parse_runtime_info(runtime_info);
|
||||
|
||||
if (feedsSortByUnread())
|
||||
resort_feedlist();
|
||||
|
||||
hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
|
||||
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -179,18 +179,12 @@
|
|||
<option value="qmcCatchupAll"><?php echo __('Mark as read') ?></option>
|
||||
<option value="qmcShowOnlyUnread"><?php echo __('(Un)hide read feeds') ?></option>
|
||||
</optgroup>
|
||||
<optgroup label="<?php echo __('Categories:') ?>">
|
||||
|
||||
<!-- <option value="qmcToggleReorder"><?php echo __('Toggle reordering mode') ?></option> -->
|
||||
<option value="qmcResetCats"><?php echo __('Reset order') ?></option>
|
||||
</optgroup>
|
||||
|
||||
<optgroup label="<?php echo __('Other actions:') ?>">
|
||||
|
||||
<option value="qmcTagCloud"><?php echo __('Show tag cloud...') ?></option>
|
||||
<option value="qmcAddLabel"><?php echo __('Create label...') ?></option>
|
||||
<option value="qmcAddFilter"><?php echo __('Create filter...') ?></option>
|
||||
<option value="qmcResetUI"><?php echo __('Reset UI layout') ?></option>
|
||||
<option value="qmcHKhelp"><?php echo __('Keyboard shortcuts help') ?></option>
|
||||
</optgroup>
|
||||
|
||||
|
|
|
|||
34
viewfeed.js
34
viewfeed.js
|
|
@ -264,7 +264,7 @@ function showArticleInHeadlines(id) {
|
|||
|
||||
cache_inject(cache_prefix + getActiveFeedId(),
|
||||
$("headlines-frame").innerHTML,
|
||||
get_feed_unread(getActiveFeedId()));
|
||||
getFeedUnread(getActiveFeedId()));
|
||||
|
||||
} else if (article_is_unread && view_mode == "all_articles") {
|
||||
|
||||
|
|
@ -272,7 +272,7 @@ function showArticleInHeadlines(id) {
|
|||
|
||||
cache_inject(cache_prefix + getActiveFeedId(),
|
||||
$("headlines-frame").innerHTML,
|
||||
get_feed_unread(getActiveFeedId())-1);
|
||||
getFeedUnread(getActiveFeedId())-1);
|
||||
|
||||
} else if (article_is_unread) {
|
||||
cache_invalidate(cache_prefix + getActiveFeedId());
|
||||
|
|
@ -1706,10 +1706,6 @@ function getArticleUnderPointer() {
|
|||
|
||||
function zoomToArticle(event, id) {
|
||||
try {
|
||||
/* var w = window.open("backend.php?op=view&mode=zoom&id=" + param_escape(id),
|
||||
"ttrss_zoom_" + id,
|
||||
"status=0,toolbar=0,location=0,width=450,height=300,scrollbars=1,menubar=0"); */
|
||||
|
||||
var cached_article = cache_find(id);
|
||||
|
||||
if (dijit.byId("ATAB-" + id))
|
||||
|
|
@ -2066,6 +2062,21 @@ function cdmClicked(event, id) {
|
|||
return false;
|
||||
}
|
||||
|
||||
function postClicked(event, id) {
|
||||
try {
|
||||
|
||||
if (!event.ctrlKey) {
|
||||
return true;
|
||||
} else {
|
||||
zoomToArticle(event, id);
|
||||
return false;
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
exception_error("postClicked");
|
||||
}
|
||||
}
|
||||
|
||||
function hlClicked(event, id) {
|
||||
try {
|
||||
|
||||
|
|
@ -2083,8 +2094,6 @@ function hlClicked(event, id) {
|
|||
} catch (e) {
|
||||
exception_error("hlClicked");
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function getFirstVisibleHeadlineId() {
|
||||
|
|
@ -2241,13 +2250,4 @@ function closeArticlePanel() {
|
|||
dijit.byId("headlines-wrap-inner").removeChild(
|
||||
dijit.byId("content-insert"));
|
||||
}
|
||||
|
||||
|
||||
/* if (id)
|
||||
if (dijit.byId("ATAB-" + id))
|
||||
return dijit.byId("content-tabs").removeChild(dijit.byId("ATAB-" + id));
|
||||
|
||||
if (dijit.byId("content-insert"))
|
||||
dijit.byId("headlines-wrap-inner").removeChild(
|
||||
dijit.byId("content-insert")); */
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue