fix search broken after userDlg -> infoBox transition

diff --git a/feedlist.js b/feedlist.js
index 2bd5847974ad48987357a7e4626257f352563cef..98290a3236a065ff7dcad7b7d52e75d8b1c7c7d8 100644 (file)
--- 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 b10e257cb33f05d4967755ad3c1a7a32d3559e72..11bcad6faaae85eebf77ff0aa356445d8e3d9b37 100644 (file)
--- 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 82a52e9424eebd7f4e4f8b2d0da71fc59d7a3935..254d9af80826ca8d7d4ff0b5d08f4c1fd857ee50 100644 (file)
--- 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 bf8d23adcacaa2e08eacfe39c1d9da881a31ee7e..0cd2bb85a510e385856b0050b3fd03730a3f3b75 100644 (file)
--- 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>