From eff4997c1faa0c9bcdd72ff50a9ba2353b75f743 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Thu, 18 May 2006 13:20:51 +0100
Subject: [PATCH] fix search broken after userDlg -> infoBox transition

---
 feedlist.js | 2 +-
 prefs.js    | 2 +-
 tt-rss.js   | 6 +++---
 tt-rss.php  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/feedlist.js b/feedlist.js
index 2bd584797..98290a323 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -124,7 +124,7 @@ function viewfeed(feed, skip, subop, doc, is_cat, subop_param) {
 	
 		if (search_query != "") {
 			query = query + "&search=" + param_escape(search_query);
-			searchbox.value = "";
+//			searchbox.value = "";
 		}
 
 		if (cat_view_mode) {
diff --git a/prefs.js b/prefs.js
index b10e257cb..11bcad6fa 100644
--- a/prefs.js
+++ b/prefs.js
@@ -608,7 +608,7 @@ function removeSelectedFeeds() {
 
 	if (sel_rows.length > 0) {
 
-		var ok = confirm("Unsubscribe from selected feeds?");
+		var ok = confirm("Unsubscribe selected feeds?");
 
 		if (ok) {
 
diff --git a/tt-rss.js b/tt-rss.js
index 82a52e942..254d9af80 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -54,7 +54,7 @@ function dlg_frefresh_callback() {
 				hframe.src = "backend.php?op=error&msg=No%20feed%20selected.";
 			}
 		}
-		closeDlg();
+		closeInfoBox();
 	} 
 }
 
@@ -292,7 +292,7 @@ function resetSearch() {
 }
 
 function search() {
-	closeDlg();	
+	closeInfoBox();	
 	viewCurrentFeed(0, "");
 }
 
@@ -494,7 +494,7 @@ function quickMenuGo(opid) {
 				return;
 			}
 	
-			if (confirm("Remove current feed?")) {
+			if (confirm("Unsubscribe current feed?")) {
 				qfdDelete(actid);
 			}
 		
diff --git a/tt-rss.php b/tt-rss.php
index bf8d23adc..0cd2bb85a 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -229,7 +229,7 @@ window.onload = init;
 				<option disabled>--------</option>
 				<option style="color : #5050aa" disabled>Feed actions:</option>
 				<option id="qmcAddFeed">&nbsp;&nbsp;Subscribe to feed</option>
-				<option id="qmcRemoveFeed">&nbsp;&nbsp;Remove this feed</option>
+				<option id="qmcRemoveFeed">&nbsp;&nbsp;Unsubscribe this feed</option>
 				<!-- <option>Edit this feed</option> -->
 				<option disabled>--------</option>
 				<option style="color : #5050aa" disabled>All feeds:</option>