help uses popup window, recolor infoBox, use subscribe dialog in prefs

1 files changed, 38 insertions, 4 deletions

diff --git a/prefs.js b/prefs.js
index d9eb9024d..6901b08cf 100644
--- a/prefs.js
+++ b/prefs.js
@@ -54,6 +54,35 @@ function feedlist_callback() {
 	}
 }
 
+/* stub for subscription dialog */
+
+function dlg_frefresh_callback() {
+	if (xmlhttp.readyState == 4) {		
+	//	setTimeout("updateFeedList()", 500);
+
+		try {
+			var container = document.getElementById('prefContent');	
+			container.innerHTML=xmlhttp.responseText;
+			selectTab("feedConfig", true);
+
+			if (caller_subop) {
+				var tuple = caller_subop.split(":");
+				if (tuple[0] == 'editFeed') {
+					window.setTimeout('editFeed('+tuple[1]+')', 100);
+				}				
+
+				caller_subop = false;
+			}
+			if (typeof correctPNG != 'undefined') {
+				correctPNG();
+			}
+			notify("");
+		} catch (e) {
+			exception_error("feedlist_callback", e);
+		}
+	}
+}
+
 function filterlist_callback() {
 	var container = document.getElementById('prefContent');
 	if (xmlhttp.readyState == 4) {
@@ -705,7 +734,7 @@ function labelTest() {
 
 function displayHelpInfobox(topic_id) {
 
-	if (!xmlhttp_ready(xmlhttp)) {
+/*	if (!xmlhttp_ready(xmlhttp)) {
 		printLockingError();
 		return
 	}
@@ -713,10 +742,15 @@ function displayHelpInfobox(topic_id) {
 	notify_progress("Loading help...");
 
 	xmlhttp.open("GET", "backend.php?op=help&tid=" +
-		param_escape(topic_id) + "&noheaders=1", true);
+		param_escape(topic_id), true);
 
-	xmlhttp.onreadystatechange=infobox_callback;
-	xmlhttp.send(null);
+	xmlhttp.onreadystatechange=helpbox_callback;
+	xmlhttp.send(null); */
+
+	var url = "backend.php?op=help&tid=" + param_escape(topic_id);
+
+	var w = window.open(url, "ttrss_help", 
+		"status=0,toolbar=0,location=0,width=400,height=450,menubar=0");
 
 }