misc code cleanup

diff --git a/feedlist.js b/feedlist.js
index b1608ec18349f333e9b2300d537d12c3ccb85af0..1136972d7a87fea680bcefb5fbac4ef307329cb8 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -55,8 +55,7 @@ function viewNextFeedPage() {
 
                console.log("viewNextFeedPage: calling viewfeed(), p: " + parseInt(_feed_cur_page+1));
 
-               viewfeed(getActiveFeedId(), undefined, activeFeedIsCat(), undefined,
-                       undefined, parseInt(_feed_cur_page+1));
+               viewfeed(getActiveFeedId(), '', activeFeedIsCat(), parseInt(_feed_cur_page+1));
 
        } catch (e) {
                exception_error("viewNextFeedPage", e);
@@ -64,12 +63,11 @@ function viewNextFeedPage() {
 }
 
 
-function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
+function viewfeed(feed, subop, is_cat, offset) {
        try {
                if (is_cat == undefined) is_cat = false;
 
-               if (offline_mode) return viewfeed_offline(feed, subop, is_cat, subop_param,
-                       skip_history, offset);
+               if (offline_mode) return viewfeed_offline(feed, subop, is_cat, offset);
 
 //             if (!offset) page_offset = 0;
 

diff --git a/functions.php b/functions.php
index f7a54b7c2730a78a3d32fbb836296bf075f19823..b4af52a04dc4395fec966734349d180f6a7aef75 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -5239,7 +5239,7 @@
 
                                                        print "<tr class='feedTitle'><td colspan='7'>".
                                                                "<div style=\"float : right\">$feed_icon_img</div>".
-                                                               "<a href=\"javascript:viewfeed($feed_id, '', false)\">".
+                                                               "<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
                                                                $line["feed_title"]."</a> $vf_catchup_link</td></tr>";
                                                }
                                        }
@@ -5280,7 +5280,7 @@
                                        if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
                                                if (@$line["feed_title"]) {                     
                                                        print "<span class=\"hlFeed\">
-                                                               (<a href=\"javascript:viewfeed($feed_id, '', false)\">".
+                                                               (<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
                                                                $line["feed_title"]."</a>)
                                                        </span>";
                                                }
@@ -5296,7 +5296,9 @@
                                        print "<td class='hlMarkedPic'>$score_pic</td>";
 
                                        if (@$line["feed_title"] && !get_pref($link, 'VFEED_GROUP_BY_FEED')) {
-                                               print "<td onclick=\"viewfeed($feed_id)\" class=\"hlFeedIcon\">$feed_icon_img</td>";
+                                               print "<td onclick=\"viewfeed($feed_id)\" 
+                                                       title=\"".htmlspecialchars($line['feed_title'])."\"
+                                                       class=\"hlFeedIcon\">$feed_icon_img</td>";
                                        }
 
                                        print "</tr>";
@@ -5323,7 +5325,7 @@
 
                                                        print "<div class='cdmFeedTitle'>".
                                                                "<div style=\"float : right\">$feed_icon_img</div>".
-                                                               "<a href=\"javascript:viewfeed($feed_id, '', false)\">".
+                                                               "<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
                                                                $line["feed_title"]."</a> $vf_catchup_link</div>";
                                                }
                                        }
@@ -5461,7 +5463,7 @@
                                                        'images/tag.png')."' alt='Tags' title='Tags'>
                                                <span id=\"ATSTR-$id\">$tags_str</span>
                                                <a title=\"".__('Edit tags for this article')."\" 
-                                               href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>";
+                                               href=\"#\" onclick=\"editArticleTags($id, $feed_id, true)\">(+)</a>";
 
                                        print "<div style=\"float : right\">";
 

diff --git a/offline.js b/offline.js
index cf60ed62e0ee7a9e12e9b0192737786012ff8725..4fb374aabf5e445bc42fc73743a23ff4d742dd97 100644 (file)
--- a/offline.js
+++ b/offline.js
@@ -66,7 +66,7 @@ function view_offline(id) {
        }
 }
 
-function viewfeed_offline(feed_id, subop, is_cat, subop_param, skip_history, offset) {
+function viewfeed_offline(feed_id, subop, is_cat, offset) {
        try {
                notify('');
 

diff --git a/tt-rss.js b/tt-rss.js
index abd0f673e70e72de4964d97ead7eabfe2b4beb72..e8384123214c5246fb0bc3fab060f290cc0881b7 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -215,18 +215,9 @@ function timeout() {
        setTimeout("timeout()", 3000);
 }
 
-function resetSearch() {
-       var searchbox = $("searchbox")
-
-       if (searchbox.value != "" && getActiveFeedId()) {       
-               searchbox.value = "";
-               viewfeed(getActiveFeedId(), "");
-       }
-}
-
 function search() {
        closeInfoBox(); 
-       viewCurrentFeed(0, "");
+       viewCurrentFeed();
 }
 
 function updateTitle() {