diff options
author | Andrew Dolgov <[email protected]> | 2011-12-11 00:10:32 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-12-11 00:10:32 +0400 |
commit | f37e541a8f6ae5dc0955e0bf4e90e86dd7537e1d (patch) | |
tree | 2cf3de358ed45eac8c298dd9b5e12f50d07a6404 /tt-rss.js | |
parent | 2ea34cc1501409f9f62d83f43de3ee494b2d73db (diff) | |
parent | b167df5e60143efbd4cc9121b7c4825f4f6608d1 (diff) |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Diffstat (limited to 'tt-rss.js')
-rw-r--r-- | tt-rss.js | 19 |
1 files changed, 6 insertions, 13 deletions
@@ -490,8 +490,6 @@ function parse_runtime_info(data) { return; } - var error_flag; - if (k == "daemon_is_running" && v != 1) { notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not running.</span>", true); return; @@ -521,7 +519,7 @@ function catchupCurrentFeed() { var str = __("Mark all articles in %s as read?").replace("%s", fn); if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) { - return viewCurrentFeed('MarkAllRead') + return viewCurrentFeed('MarkAllRead'); } } @@ -534,7 +532,7 @@ function catchupFeedInGroup(id) { var str = __("Mark all articles in %s as read?").replace("%s", title); if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) { - return viewCurrentFeed('MarkAllReadGR:' + id) + return viewCurrentFeed('MarkAllReadGR:' + id); } } catch (e) { @@ -566,11 +564,11 @@ function collapse_feedlist() { } function viewModeChanged() { - return viewCurrentFeed('') + return viewCurrentFeed(''); } function viewLimitChanged() { - return viewCurrentFeed('') + return viewCurrentFeed(''); } /* function adjustArticleScore(id, score) { @@ -628,7 +626,7 @@ function hotkey_handler(e) { if (e.target.nodeName == "INPUT" || e.target.nodeName == "TEXTAREA") return; - var keycode; + var keycode = false; var shift_key = false; var cmdline = $('cmdline'); @@ -780,7 +778,7 @@ function hotkey_handler(e) { } if (keycode == 85) { // u - selectionToggleUnread(undefined, false, true) + selectionToggleUnread(undefined, false, true); return; } @@ -916,11 +914,6 @@ function hotkey_handler(e) { } } - if (keycode == 87) { // w - feeds_sort_by_unread = !feeds_sort_by_unread; - return resort_feedlist(); - } - if (keycode == 88) { // x reverseHeadlineOrder(); return; |