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

code cleanup

This commit is contained in:
Andrew Dolgov 2010-02-03 16:35:16 +03:00
parent d002edc715
commit f2a648e1b2
3 changed files with 36 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
feedlist.js
View File

@ -30,40 +30,6 @@ function viewCategory(cat) {
return false; return false;
} }
function printFeedEntry(id, title, row_class, unread, icon) {
var tmp = "";
var fctr_class = "";
var feed_icon = "";
if (unread > 0) {
row_class += "Unread";
fctr_class = "feedCtrHasUnread";
} else {
fctr_class = "feedCtrNoUnread";
}
if (icon) {
feed_icon = "<img id='FIMG-"+id+"' src='" + icon + "'>";
} else {
feed_icon = "<img id='FIMG-"+id+"' src='images/blank_icon.gif'>";
}
var link = "<a title=\"FIXME\" id=\"FEEDL-"+id+"\""+
"href=\"javascript:viewfeed('"+id+"', '', false, '', false, 0);\">"+
title + "</a>";
tmp += "<li id='FEEDR-"+id+"' class="+row_class+">" + feed_icon +
"<span id=\"FEEDN-"+id+"\">" + link + "</span>";
tmp += " <span class='"+fctr_class+"' id=\"FEEDCTR-"+id+"\">" +
"(<span id=\"FEEDU-"+id+"\">"+unread+"</span>)</span>";
tmp += "</li>";
return tmp;
}
function render_feedlist(data) { function render_feedlist(data) {
try { try {
@ -429,9 +395,6 @@ function feedlist_dragsorted(ctr) {
function feedlist_init() { function feedlist_init() {
try { try {
// if (arguments.callee.done) return;
// arguments.callee.done = true;
loading_set_progress(90); loading_set_progress(90);
debug("in feedlist init"); debug("in feedlist init");

36
offline.js
View File

@ -1751,3 +1751,39 @@ function offlineConfirmModeChange() {
exception_error("offlineConfirmModeChange", e); exception_error("offlineConfirmModeChange", e);
} }
} }
function printFeedEntry(id, title, row_class, unread, icon) {
var tmp = "";
var fctr_class = "";
var feed_icon = "";
if (unread > 0) {
row_class += "Unread";
fctr_class = "feedCtrHasUnread";
} else {
fctr_class = "feedCtrNoUnread";
}
if (icon) {
feed_icon = "<img id='FIMG-"+id+"' src='" + icon + "'>";
} else {
feed_icon = "<img id='FIMG-"+id+"' src='images/blank_icon.gif'>";
}
var link = "<a title=\"FIXME\" id=\"FEEDL-"+id+"\""+
"href=\"javascript:viewfeed('"+id+"', '', false, '', false, 0);\">"+
title + "</a>";
tmp += "<li id='FEEDR-"+id+"' class="+row_class+">" + feed_icon +
"<span id=\"FEEDN-"+id+"\">" + link + "</span>";
tmp += " <span class='"+fctr_class+"' id=\"FEEDCTR-"+id+"\">" +
"(<span id=\"FEEDU-"+id+"\">"+unread+"</span>)</span>";
tmp += "</li>";
return tmp;
}

68
viewfeed.js
View File

@ -473,21 +473,6 @@ function view(id) {
if (!cached_article) { if (!cached_article) {
// notify_progress("Loading, please wait...", true);
/* var content = $('HLC-' + id);
if (content && !$('LL-' + id)) {
var ll = document.createElement('img');
ll.src = 'images/indicator_tiny.gif';
ll.className = 'hlLoading';
ll.id = 'LL-' + id;
content.appendChild(ll);
} */
var upic = $('FUPDPIC-' + id); var upic = $('FUPDPIC-' + id);
if (upic) { if (upic) {
@ -597,7 +582,6 @@ function toggleMark(id, client_only, no_effects) {
} }
} else { } else {
//mark_img.src = "images/mark_unset.png";
mark_img.alt = __("Please wait..."); mark_img.alt = __("Please wait...");
query = query + "&mark=0"; query = query + "&mark=0";
@ -665,7 +649,6 @@ function togglePub(id, client_only, no_effects, note) {
query = query + "&pub=1"; query = query + "&pub=1";
} else { } else {
//mark_img.src = "images/pub_unset.png";
mark_img.alt = __("Please wait..."); mark_img.alt = __("Please wait...");
query = query + "&pub=0"; query = query + "&pub=0";
@ -1128,12 +1111,6 @@ function selectionToggleMarked(cdm_mode) {
query = query + "&afid=" + getActiveFeedId(); query = query + "&afid=" + getActiveFeedId();
/* if (tagsAreDisplayed()) {
query = query + "&omode=tl";
} else {
query = query + "&omode=flc";
} */
query = query + "&omode=lc"; query = query + "&omode=lc";
new Ajax.Request("backend.php", { new Ajax.Request("backend.php", {
@ -1176,12 +1153,6 @@ function selectionTogglePublished(cdm_mode) {
query = query + "&afid=" + getActiveFeedId(); query = query + "&afid=" + getActiveFeedId();
/* if (tagsAreDisplayed()) {
query = query + "&omode=tl";
} else {
query = query + "&omode=flc";
} */
query = query + "&omode=lc"; query = query + "&omode=lc";
new Ajax.Request("backend.php", { new Ajax.Request("backend.php", {
@ -1438,10 +1409,8 @@ function catchupSelection() {
if ($("headlinesList")) { if ($("headlinesList")) {
selectionToggleUnread(false, false, 'viewCurrentFeed()', true); selectionToggleUnread(false, false, 'viewCurrentFeed()', true);
// selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
} else { } else {
selectionToggleUnread(true, false, 'viewCurrentFeed()', true) selectionToggleUnread(true, false, 'viewCurrentFeed()', true)
// cdmSelectArticles('none');
} }
} catch (e) { } catch (e) {
@ -2212,43 +2181,6 @@ function zoomToArticle(id) {
} }
} }
function showOriginalArticleInline(id) {
try {
var query = "?op=rpc&subop=getArticleLink&id=" + id;
notify_progress("Loading, please wait...", true);
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
if (transport.responseXML) {
var link = transport.responseXML.getElementsByTagName("link")[0];
var id = transport.responseXML.getElementsByTagName("id")[0];
notify("");
if (link && id) {
link = link.firstChild.nodeValue;
var ci = $("content-insert");
var tmp = "<iframe id=\"inline_orig_article\" width=\""+ci.offsetWidth+"\" height=\""+ci.offsetHeight+"\" style=\"border-width : 0px;\" src=\""+link+"\"></iframe>";
render_article(tmp);
}
}
} });
} catch (e) {
exception_error("showOriginalArticleInline", e);
}
}
function scrollArticle(offset) { function scrollArticle(offset) {
try { try {
if (!isCdmMode()) { if (!isCdmMode()) {