fix global search
This commit is contained in:
parent
8b2cbc332b
commit
ab9d9e8df4
2 changed files with 16 additions and 7 deletions
19
feedlist.js
19
feedlist.js
|
@ -15,12 +15,24 @@ function viewfeed(feed, skip, subop, doc) {
|
|||
search_query = "";
|
||||
}
|
||||
|
||||
var searchmodebox = doc.getElementById("searchmodebox");
|
||||
|
||||
var search_mode;
|
||||
|
||||
if (searchmodebox) {
|
||||
search_mode = searchmodebox[searchmodebox.selectedIndex].text;
|
||||
} else {
|
||||
search_mode = "";
|
||||
}
|
||||
|
||||
setCookie("ttrss_vf_smode", search_mode);
|
||||
|
||||
var viewbox = doc.getElementById("viewbox");
|
||||
|
||||
var view_mode;
|
||||
|
||||
if (viewbox) {
|
||||
view_mode = viewbox.value;
|
||||
view_mode = viewbox[viewbox.selectedIndex].text;
|
||||
} else {
|
||||
view_mode = "All Posts";
|
||||
}
|
||||
|
@ -32,7 +44,7 @@ function viewfeed(feed, skip, subop, doc) {
|
|||
var limit;
|
||||
|
||||
if (limitbox) {
|
||||
limit = limitbox.value;
|
||||
limit = limitbox[limitbox.selectedIndex].text;
|
||||
setCookie("ttrss_vf_limit", limit);
|
||||
} else {
|
||||
limit = "All";
|
||||
|
@ -56,7 +68,8 @@ function viewfeed(feed, skip, subop, doc) {
|
|||
|
||||
var query = "backend.php?op=viewfeed&feed=" + param_escape(feed) +
|
||||
"&skip=" + param_escape(skip) + "&subop=" + param_escape(subop) +
|
||||
"&view=" + param_escape(view_mode) + "&limit=" + limit;
|
||||
"&view=" + param_escape(view_mode) + "&limit=" + limit +
|
||||
"&smode=" + param_escape(search_mode);
|
||||
|
||||
if (search_query != "") {
|
||||
query = query + "&search=" + param_escape(search_query);
|
||||
|
|
|
@ -8,11 +8,7 @@ var xmlhttp = false;
|
|||
var total_unread = 0;
|
||||
var first_run = true;
|
||||
|
||||
var search_query = "";
|
||||
var search_mode = "";
|
||||
|
||||
var display_tags = false;
|
||||
//var display_read_feeds = true;
|
||||
|
||||
var global_unread = 0;
|
||||
|
||||
|
|
Loading…
Reference in a new issue