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

misc code cleanup

This commit is contained in:
Andrew Dolgov 2010-11-12 17:41:32 +03:00
parent 817dcf1bf8
commit 4169bb67e8
4 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
feedlist.js
View File

@ -55,8 +55,7 @@ function viewNextFeedPage() {
console.log("viewNextFeedPage: calling viewfeed(), p: " + parseInt(_feed_cur_page+1)); console.log("viewNextFeedPage: calling viewfeed(), p: " + parseInt(_feed_cur_page+1));
viewfeed(getActiveFeedId(), undefined, activeFeedIsCat(), undefined, viewfeed(getActiveFeedId(), '', activeFeedIsCat(), parseInt(_feed_cur_page+1));
undefined, parseInt(_feed_cur_page+1));
} catch (e) { } catch (e) {
exception_error("viewNextFeedPage", 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 { try {
if (is_cat == undefined) is_cat = false; if (is_cat == undefined) is_cat = false;
if (offline_mode) return viewfeed_offline(feed, subop, is_cat, subop_param, if (offline_mode) return viewfeed_offline(feed, subop, is_cat, offset);
skip_history, offset);
// if (!offset) page_offset = 0; // if (!offset) page_offset = 0;

12
functions.php
View File

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

2
offline.js
View File

@ -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 { try {
notify(''); notify('');

11
tt-rss.js
View File

@ -215,18 +215,9 @@ function timeout() {
setTimeout("timeout()", 3000); setTimeout("timeout()", 3000);
} }
function resetSearch() {
var searchbox = $("searchbox")
if (searchbox.value != "" && getActiveFeedId()) {
searchbox.value = "";
viewfeed(getActiveFeedId(), "");
}
}
function search() { function search() {
closeInfoBox(); closeInfoBox();
viewCurrentFeed(0, ""); viewCurrentFeed();
} }
function updateTitle() { function updateTitle() {