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

code cleanups, make feedlist_callback async

This commit is contained in:
Andrew Dolgov 2007-08-24 05:49:57 +01:00
parent 6b8bbd1dae
commit 0df398da2c
3 changed files with 18 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
feedlist.js
View File

@ -10,10 +10,18 @@ function viewCategory(cat) {
function feedlist_callback() { function feedlist_callback() {
if (xmlhttp.readyState == 4) { if (xmlhttp.readyState == 4) {
debug("feedlist_callback"); feedlist_callback2(xmlhttp);
}
}
function feedlist_callback2(transport) {
try {
debug("feedlist_callback2");
var f = document.getElementById("feeds-frame"); var f = document.getElementById("feeds-frame");
f.innerHTML = xmlhttp.responseText; f.innerHTML = transport.responseText;
feedlist_init(); feedlist_init();
} catch (e) {
exception_error("feedlist_callback2", e);
} }
} }

21
prefs.js
View File

@ -48,7 +48,6 @@ function expand_feed_callback() {
var container = document.getElementById("BRDET-" + feed_to_expand); var container = document.getElementById("BRDET-" + feed_to_expand);
container.innerHTML=xmlhttp.responseText; container.innerHTML=xmlhttp.responseText;
// container.style.display = "block"; // container.style.display = "block";
// p_notify("");
Effect.Appear(container, {duration : 0.5}); Effect.Appear(container, {duration : 0.5});
} catch (e) { } catch (e) {
exception_error("expand_feed_callback", e); exception_error("expand_feed_callback", e);
@ -248,10 +247,6 @@ function updateFeedList(sort_key) {
return return
} }
// document.getElementById("prefContent").innerHTML = "Loading feeds, please wait...";
// p_notify("Loading, please wait...");
var feed_search = document.getElementById("feed_search"); var feed_search = document.getElementById("feed_search");
var search = ""; var search = "";
if (feed_search) { search = feed_search.value; } if (feed_search) { search = feed_search.value; }
@ -279,10 +274,6 @@ function updateUsersList(sort_key) {
return return
} }
// document.getElementById("prefContent").innerHTML = "Loading feeds, please wait...";
// p_notify("Loading, please wait...");
xmlhttp.open("GET", "backend.php?op=pref-users&sort=" xmlhttp.open("GET", "backend.php?op=pref-users&sort="
+ param_escape(sort_key), true); + param_escape(sort_key), true);
xmlhttp.onreadystatechange=userlist_callback; xmlhttp.onreadystatechange=userlist_callback;
@ -1153,10 +1144,6 @@ function updateFilterList(sort_key) {
return return
} }
// document.getElementById("prefContent").innerHTML = "Loading filters, please wait...";
// p_notify("Loading, please wait...");
xmlhttp.open("GET", "backend.php?op=pref-filters&sort=" + xmlhttp.open("GET", "backend.php?op=pref-filters&sort=" +
param_escape(sort_key), true); param_escape(sort_key), true);
xmlhttp.onreadystatechange=filterlist_callback; xmlhttp.onreadystatechange=filterlist_callback;
@ -1171,10 +1158,6 @@ function updateLabelList(sort_key) {
return return
} }
// p_notify("Loading, please wait...");
// document.getElementById("prefContent").innerHTML = "Loading labels, please wait...";
xmlhttp.open("GET", "backend.php?op=pref-labels&sort=" + xmlhttp.open("GET", "backend.php?op=pref-labels&sort=" +
param_escape(sort_key), true); param_escape(sort_key), true);
xmlhttp.onreadystatechange=labellist_callback; xmlhttp.onreadystatechange=labellist_callback;
@ -1188,8 +1171,6 @@ function updatePrefsList() {
return return
} }
// p_notify("Loading, please wait...");
xmlhttp.open("GET", "backend.php?op=pref-prefs", true); xmlhttp.open("GET", "backend.php?op=pref-prefs", true);
xmlhttp.onreadystatechange=prefslist_callback; xmlhttp.onreadystatechange=prefslist_callback;
xmlhttp.send(null); xmlhttp.send(null);
@ -1467,8 +1448,6 @@ function updateBigFeedBrowser(limit) {
return return
} }
// p_notify("Loading, please wait...");
var query = "backend.php?op=pref-feed-browser"; var query = "backend.php?op=pref-feed-browser";
var limit_sel = document.getElementById("feedBrowserLimit"); var limit_sel = document.getElementById("feedBrowserLimit");

37
tt-rss.js
View File

@ -219,14 +219,10 @@ function updateFeedList(silent, fetch) {
debug("updateFeedList Q=" + query_str); debug("updateFeedList Q=" + query_str);
if (xmlhttp_ready(xmlhttp)) { new Ajax.Request(query_str, {
xmlhttp.open("GET", query_str, true); onComplete: function(transport) {
xmlhttp.onreadystatechange=feedlist_callback; feedlist_callback2(transport);
xmlhttp.send(null); } });
} else {
debug("xmlhttp busy");
//printLockingError();
}
} }
@ -238,14 +234,10 @@ function catchupAllFeeds() {
debug("catchupAllFeeds Q=" + query_str); debug("catchupAllFeeds Q=" + query_str);
if (xmlhttp_ready(xmlhttp)) { new Ajax.Request(query_str, {
xmlhttp.open("GET", query_str, true); onComplete: function(transport) {
xmlhttp.onreadystatechange=feedlist_callback; feedlist_callback2(transport);
xmlhttp.send(null); } });
} else {
debug("xmlhttp busy");
//printLockingError();
}
global_unread = 0; global_unread = 0;
updateTitle(""); updateTitle("");
@ -297,19 +289,6 @@ function search() {
viewCurrentFeed(0, ""); viewCurrentFeed(0, "");
} }
function localPiggieFunction(enable) {
if (enable) {
var query_str = "backend.php?op=feeds&subop=piggie";
if (xmlhttp_ready(xmlhttp)) {
xmlhttp.open("GET", query_str, true);
xmlhttp.onreadystatechange=feedlist_callback;
xmlhttp.send(null);
}
}
}
// if argument is undefined, current subtitle is not updated // if argument is undefined, current subtitle is not updated
// use blank string to clear subtitle // use blank string to clear subtitle
function updateTitle(s) { function updateTitle(s) {