From e331188f761669785024bc0f76debb904a1b6210 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 10 Dec 2011 21:26:59 +0400 Subject: misc typo fixes --- feedlist.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'feedlist.js') diff --git a/feedlist.js b/feedlist.js index 4f1a56c2a..c117b66e9 100644 --- a/feedlist.js +++ b/feedlist.js @@ -104,8 +104,6 @@ function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) { dijit.byId("content-tabs").selectChild( dijit.byId("content-tabs").getChildren()[0]); - var force_nocache = false; - if (!background) { if (getActiveFeedId() != feed || offset == 0) { active_post_id = 0; @@ -312,18 +310,14 @@ function displayNewContentPrompt(id) { function parse_counters(elems, scheduled_call) { try { - - var feeds_found = 0; - for (var l = 0; l < elems.length; l++) { - var id = elems[l].id + var id = elems[l].id; var kind = elems[l].kind; - var ctr = parseInt(elems[l].counter) + var ctr = parseInt(elems[l].counter); var error = elems[l].error; var has_img = elems[l].has_img; var updated = elems[l].updated; - var title = elems[l].title; if (id == "global-unread") { global_unread = ctr; @@ -336,8 +330,6 @@ function parse_counters(elems, scheduled_call) { continue; } - var treeItem; - // TODO: enable new content notification for categories if (!activeFeedIsCat() && id == getActiveFeedId() -- cgit v1.2.3-54-g00ecf From 17eb362b96ca3394cecab722a037d53acb062a8c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 10 Dec 2011 21:42:15 +0400 Subject: viewfeed: only select first tab when request is not background --- feedlist.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'feedlist.js') diff --git a/feedlist.js b/feedlist.js index c117b66e9..9b9ca927f 100644 --- a/feedlist.js +++ b/feedlist.js @@ -100,7 +100,7 @@ function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) { } } - if (offset == 0) + if (offset == 0 && !background) dijit.byId("content-tabs").selectChild( dijit.byId("content-tabs").getChildren()[0]); -- cgit v1.2.3-54-g00ecf From 77c3c5f9faaa61acd276b213807472c5fc29d4ba Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 10 Dec 2011 21:43:03 +0400 Subject: viewfeed: fix typo --- feedlist.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'feedlist.js') diff --git a/feedlist.js b/feedlist.js index 9b9ca927f..e0ffae7f1 100644 --- a/feedlist.js +++ b/feedlist.js @@ -48,7 +48,7 @@ function loadMoreHeadlines() { } -function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) { +function viewfeed(feed, subop, is_cat, offset, background, infscroll_req) { try { if (is_cat == undefined) is_cat = false; @@ -58,7 +58,7 @@ function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) { if (subop == undefined) subop = ''; if (offset == undefined) offset = 0; if (background == undefined) background = false; - if (infscrol_req == undefined) infscrol_req = false; + if (infscroll_req == undefined) infscroll_req = false; last_requested_article = 0; @@ -209,7 +209,7 @@ function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) { parameters: query, onComplete: function(transport) { setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif'); - headlines_callback2(transport, offset, background, infscrol_req); + headlines_callback2(transport, offset, background, infscroll_req); } }); } catch (e) { -- cgit v1.2.3-54-g00ecf From b167df5e60143efbd4cc9121b7c4825f4f6608d1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 10 Dec 2011 22:40:12 +0400 Subject: js: misc cleanup --- feedlist.js | 4 ---- functions.php | 8 ++++---- help/3.php | 3 --- tt-rss.js | 5 ----- viewfeed.js | 8 -------- 5 files changed, 4 insertions(+), 24 deletions(-) (limited to 'feedlist.js') diff --git a/feedlist.js b/feedlist.js index e0ffae7f1..62c44b494 100644 --- a/feedlist.js +++ b/feedlist.js @@ -378,10 +378,6 @@ function getFeedUnread(feed, is_cat) { return -1; } -function resort_feedlist() { - console.warn("resort_feedlist: function not implemented"); -} - function hideOrShowFeeds(hide) { var tree = dijit.byId("feedTree"); diff --git a/functions.php b/functions.php index a1dffc853..cad0b21c3 100644 --- a/functions.php +++ b/functions.php @@ -5077,24 +5077,24 @@ $marked_pic = "\"Unstar"; + onclick='javascript:toggleMark($id)'>"; } else { $marked_pic = "\"Star"; + onclick='javascript:toggleMark($id)'>"; } if ($line["published"] == "t" || $line["published"] == "1") { $published_pic = "\"Unpublish"; + alt=\"Unpublish article\" onclick='javascript:togglePub($id)'>"; } else { $published_pic = "\"Publish"; + alt=\"Publish article\" onclick='javascript:togglePub($id)'>"; } # $content_link = "" . diff --git a/help/3.php b/help/3.php index fa2ee4582..e1812b3f2 100644 --- a/help/3.php +++ b/help/3.php @@ -33,7 +33,6 @@ c l c f c s - ? @@ -52,11 +51,9 @@ - - diff --git a/tt-rss.js b/tt-rss.js index 39e5cecef..36e0d8cc4 100644 --- a/tt-rss.js +++ b/tt-rss.js @@ -914,11 +914,6 @@ function hotkey_handler(e) { } } - if (keycode == 87) { // w - feeds_sort_by_unread = !feeds_sort_by_unread; - return resort_feedlist(); - } - if (keycode == 88) { // x reverseHeadlineOrder(); return; diff --git a/viewfeed.js b/viewfeed.js index 52f081ba0..c7236c601 100644 --- a/viewfeed.js +++ b/viewfeed.js @@ -404,14 +404,6 @@ function view(id) { } } -function tMark(id) { - return toggleMark(id); -} - -function tPub(id) { - return togglePub(id); -} - function toggleMark(id, client_only) { try { var query = "?op=rpc&id=" + id + "&subop=mark"; -- cgit v1.2.3-54-g00ecf
f r
f a
f s
f e
f q
f x
Q