From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 15 Feb 2009 19:41:16 +0000 (+0300)
Subject: offline: actions dropdown works
X-Git-Tag: 1.3.1~11
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=46b84d2998e7e30722592373b8d3677f345e0963;p=tt-rss.git

offline: actions dropdown works
---

diff --git a/offline.js b/offline.js
index e146b55e..3b3695fa 100644
--- a/offline.js
+++ b/offline.js
@@ -146,16 +146,29 @@ function viewfeed_offline(feed_id, subop, is_cat, subop_param, skip_history, off
 				var sel_none_link;
 				var sel_inv_link;
 
+				var catchup_feed_link = "javascript:catchupCurrentFeed()";
+				var catchup_sel_link = "javascript:catchupSelection()";
+
+				var tog_unread_link;
+				var tog_marked_link;
+
 				if ($("content-frame")) {
 					sel_all_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)";
 					sel_unread_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)";
 					sel_none_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)";
 					sel_inv_link = "javascript:invertHeadlineSelection()";
+
+					tog_unread_link = "javascript:selectionToggleUnread()";
+					tog_marked_link = "javascript:selectionToggleMarked()";
+
 				} else {
 					sel_all_link = "javascript:cdmSelectArticles('all')";
 					sel_unread_link = "javascript:cdmSelectArticles('unread')";
 					sel_none_link = "javascript:cdmSelectArticles('none')";
 					sel_inv_link = "javascript:invertHeadlineSelection()";
+
+					tog_unread_link = "javascript:selectionToggleUnread(true)";
+					tog_marked_link = "javascript:selectionToggleMarked(true)";
 				}
 
 				tmp += __('Select:')+
@@ -174,11 +187,6 @@ function viewfeed_offline(feed_id, subop, is_cat, subop_param, skip_history, off
 
 				tmp += "<ul id=\"headlineActionsBody\" style=\"display : none\">";
 
-				var tog_unread_link = "";
-				var tog_marked_link = "";
-				var catchup_sel_link = "";
-				var catchup_feed_link = "";
-
 				tmp += "<li class=\"insensitive\">"+__('Selection toggle:')+"</li>"+
 				"<li onclick=\""+tog_unread_link+"\">&nbsp;&nbsp;"+__('Unread')+"</li>"+
 				"<li onclick=\""+tog_marked_link+"\">&nbsp;&nbsp;"+__('Starred')+"</li>"+
diff --git a/viewfeed.js b/viewfeed.js
index 339950ca..be1a442e 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -575,7 +575,7 @@ function toggleMark(id, client_only, no_effects) {
 
 		}
 
-		update_local_feedlist_counters();
+		if (!no_effects) update_local_feedlist_counters();
 
 		if (!client_only) {
 			debug(query);
@@ -973,20 +973,34 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
 					} else {
 						row.className = nc + "UnreadSelected";
 					}
+					if (db) {
+						db.execute("UPDATE articles SET unread = NOT unread WHERE id = ?", 
+							[rows[i]]);
+					}
 				}
 
 				if (set_state == false) {
 					row.className = nc + "Selected";
+					if (db) {
+						db.execute("UPDATE articles SET unread = 0 WHERE id = ?", 
+							[rows[i]]);
+					}
 				}
 
 				if (set_state == true) {
 					row.className = nc + "UnreadSelected";
+					if (db) {
+						db.execute("UPDATE articles SET unread = 1 WHERE id = ?", 
+							[rows[i]]);
+					}
 				}
 			}
 		}
 
 		if (rows.length > 0) {
 
+			update_local_feedlist_counters();
+
 			var cmode = "";
 
 			if (set_state == undefined) {
@@ -1034,6 +1048,8 @@ function selectionToggleMarked(cdm_mode) {
 			toggleMark(rows[i], true, true);
 		}
 
+		update_local_feedlist_counters();
+
 		if (rows.length > 0) {
 
 			var query = "backend.php?op=rpc&subop=markSelected&ids=" +