diff options
| -rw-r--r-- | backend.php | 2 | ||||
| -rw-r--r-- | feedlist.js | 4 | ||||
| -rw-r--r-- | tt-rss.js | 1 | ||||
| -rw-r--r-- | tt-rss.php | 28 |
4 files changed, 15 insertions, 20 deletions
diff --git a/backend.php b/backend.php index 25305e5ab..8e3529287 100644 --- a/backend.php +++ b/backend.php @@ -757,8 +757,6 @@ window.onload = init; </script>"; -// print_r($_GET); - $search = db_escape_string($_GET["query"]); $search_mode = db_escape_string($_GET["search_mode"]); $match_on = db_escape_string($_GET["match_on"]); diff --git a/feedlist.js b/feedlist.js index b5ca9aca2..f61feac60 100644 --- a/feedlist.js +++ b/feedlist.js @@ -79,6 +79,10 @@ function viewfeed(feed, skip, subop, doc, is_cat, subop_param) { var toolbar_query = parent.Form.serialize("main_toolbar_form"); + if (parent.document.forms["main_toolbar_form"].query) { + parent.document.forms["main_toolbar_form"].query.value = ""; + } + var query = "backend.php?op=viewfeed&feed=" + feed + "&" + toolbar_query + "&subop=" + param_escape(subop); @@ -248,6 +248,7 @@ function viewCurrentFeed(skip, subop) { disableContainerChildren("headlinesToolbar", false, document); viewfeed(-1, skip, subop); // FIXME } + return false; // block unneeded form submits } function viewfeed(feed, skip, subop) { diff --git a/tt-rss.php b/tt-rss.php index c915bbc2d..c40521563 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -150,26 +150,17 @@ window.onload = init; <tr><td class="headlinesToolbar" id="headlinesToolbar"> -<!-- <? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?> + <form id="main_toolbar_form"> - <input id="searchbox" + <? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?> + <input name="query" + onKeyPress="return filterCR(event)" onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();"> - <select id="searchmodebox"> - <option value="all_feeds">All feeds</option> - <option value="this_feed" selected>This feed</option> - <? if (get_pref($link, 'ENABLE_FEED_CATS')) { ?> - <option value="this_cat">This category</option> - <? } ?> - </select> - - <input type="submit" - class="button" onclick="javascript:search()" value="Search"> + <input class="button" type="submit" + onclick="return viewCurrentFeed(0)" value="Search"> + + <? } ?> - - - <? } ?> --> - - <form id="main_toolbar_form"> View: <select name="view_mode" onchange="viewCurrentFeed(0, '')"> <option selected value="adaptive">Adaptive</option> @@ -177,7 +168,8 @@ window.onload = init; <option value="marked">Starred</option> <option value="unread">Unread</option> </select> - Limit: + + Limit: <? $limits = array(15 => 15, 30 => 30, 60 => 60, 0 => "All"); |