public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-23 05:21:29 +00:00
Code Issues Releases Wiki Activity

remove manual download dialog; make offline updates automatic

Browse Source
This commit is contained in:
Andrew Dolgov
2009-02-03 21:45:31 +03:00
parent 429326510c
commit 51f6f91758
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/backend-rpc.php
View File

@@ -517,10 +517,12 @@
if ($subop == "download") { if ($subop == "download") {
$stage = (int) $_REQUEST["stage"]; $stage = (int) $_REQUEST["stage"];
$cid = db_escape_string($_REQUEST["cid"]); $cid = db_escape_string($_REQUEST["cid"]);
$amount = (int) $_REQUEST["amount"]; //$amount = (int) $_REQUEST["amount"];
$unread_only = db_escape_string($_REQUEST["unread_only"]); //$unread_only = db_escape_string($_REQUEST["unread_only"]);
//if (!$amount) $amount = 50;
if (!$amount) $amount = 50; $amount = 100;
$unread_only = true;
print "<rpc-reply>"; print "<rpc-reply>";

4
modules/popup-dialog.php
View File

@@ -461,7 +461,7 @@
return; return;
} }
if ($id == "offlineDownload") { /* if ($id == "offlineDownload") {
print "<div id=\"infoBoxTitle\">".__('Download articles')."</div>"; print "<div id=\"infoBoxTitle\">".__('Download articles')."</div>";
print "<div class=\"infoBoxContents\">"; print "<div class=\"infoBoxContents\">";
@@ -500,7 +500,7 @@
print "</div>"; print "</div>";
return; return;
} } */
print "<div id='infoBoxTitle'>Internal Error</div> print "<div id='infoBoxTitle'>Internal Error</div>

30
tt-rss.js
View File

@@ -670,10 +670,10 @@ function quickMenuGo(opid) {
resize_headlines(); resize_headlines();
} }
if (opid == "qmcDownload") { /* if (opid == "qmcDownload") {
displayDlg("offlineDownload"); displayDlg("offlineDownload");
return; return;
} } */
if (opid == "qmcResetCats") { if (opid == "qmcResetCats") {
@@ -1308,7 +1308,7 @@ function hotkey_handler(e) {
} }
} }
if (keycode == 68 && shift_key) { // D /* if (keycode == 68 && shift_key) { // D
initiate_offline_download(); initiate_offline_download();
return false; return false;
} }
@@ -1316,7 +1316,7 @@ function hotkey_handler(e) {
if (keycode == 68) { // d if (keycode == 68) { // d
displayDlg("offlineDownload"); displayDlg("offlineDownload");
return false; return false;
} } */
if (keycode == 87) { // w if (keycode == 87) { // w
feeds_sort_by_unread = !feeds_sort_by_unread; feeds_sort_by_unread = !feeds_sort_by_unread;
@@ -1532,8 +1532,7 @@ function init_gears() {
db.execute("CREATE TABLE if not exists articles (id integer, feed_id integer, title text, link text, guid text, updated text, content text, tags text, unread text, marked text, added text)"); db.execute("CREATE TABLE if not exists articles (id integer, feed_id integer, title text, link text, guid text, updated text, content text, tags text, unread text, marked text, added text)");
var qmcDownload = document.getElementById("qmcDownload"); window.setTimeout("update_offline_data(0)", 100);
if (qmcDownload) Element.show(qmcDownload);
} }
@@ -1583,7 +1582,7 @@ function offline_download_parse(stage, transport) {
[id, title, has_icon]); [id, title, has_icon]);
} }
window.setTimeout("initiate_offline_download("+(stage+1)+")", 50); window.setTimeout("update_offline_data("+(stage+1)+")", 50);
} else { } else {
var articles = transport.responseXML.getElementsByTagName("article"); var articles = transport.responseXML.getElementsByTagName("article");
@@ -1610,10 +1609,10 @@ function offline_download_parse(stage, transport) {
} }
if (articles_found > 0) { if (articles_found > 0) {
window.setTimeout("initiate_offline_download("+(stage+1)+")", 50); window.setTimeout("update_offline_data("+(stage+1)+")", 50);
} else { } else {
notify_info("All done."); // notify_info("All done.");
closeInfoBox(); // closeInfoBox();
} }
} }
@@ -1623,13 +1622,14 @@ function offline_download_parse(stage, transport) {
} }
} }
function initiate_offline_download(stage, caller) { function update_offline_data(stage) {
try { try {
if (!stage) stage = 0; if (!stage) stage = 0;
if (caller) caller.disabled = true;
notify_progress("Loading, please wait... (" + stage +")", true); debug("update_offline_data: stage " + stage);
// notify_progress("Loading, please wait... (" + stage +")", true);
var query = "backend.php?op=rpc&subop=download&stage=" + stage; var query = "backend.php?op=rpc&subop=download&stage=" + stage;
@@ -1644,10 +1644,6 @@ function initiate_offline_download(stage, caller) {
query = query + "&cid=" + offline_dl_max_id; query = query + "&cid=" + offline_dl_max_id;
} }
if (document.getElementById("download_ops_form")) {
query = query + "&" + Form.serialize("download_ops_form");
}
new Ajax.Request(query, { new Ajax.Request(query, {
onComplete: function(transport) { onComplete: function(transport) {
offline_download_parse(stage, transport); offline_download_parse(stage, transport);