diff options
author | Andrew Dolgov <[email protected]> | 2012-10-30 10:24:30 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2012-10-30 10:24:30 +0400 |
commit | 74467907c57d7c51abdf076f8a9c133e1a63ecd2 (patch) | |
tree | 693ac584b66820b039edc6dfd141c21197fab5fe | |
parent | 24be5e836fdd3c23f30f3a452cc9c794da09ca1d (diff) |
add special link to cancel current search
-rw-r--r-- | classes/feeds.php | 3 | ||||
-rw-r--r-- | js/viewfeed.js | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index e6c9e0e37..8dad16584 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -59,6 +59,7 @@ class Feeds extends Handler_Protected { // right part
$reply .= "<span class='r'>";
+ $reply .= "<span id='feed_title'>";
if ($feed_site_url) {
$target = "target=\"_blank\"";
@@ -73,6 +74,8 @@ class Feeds extends Handler_Protected { $reply .= $feed_title;
}
+ $reply .= "</span>";
+
$reply .= "
<a href=\"#\"
title=\"".__("View as RSS feed")."\"
diff --git a/js/viewfeed.js b/js/viewfeed.js index c55b5ccd9..86e0076c1 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -98,6 +98,12 @@ function headlines_callback2(transport, offset, background, infscroll_req) { initHeadlinesMenu(); + if (_search_query) { + $("feed_title").innerHTML += "<span id='cancel_search'>" + + " (<a href='#' onclick='cancelSearch()'>" + __("Cancel search") + "</a>)" + + "</span>"; + } + } else { if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) { @@ -2123,4 +2129,11 @@ function precache_headlines() { } } - +function cancelSearch() { + try { + _search_query = ""; + viewCurrentFeed(); + } catch (e) { + exception_error("cancelSearch", e); + } +} |