misc typo fixes

[tt-rss.git] / tt-rss.js

diff --git a/tt-rss.js b/tt-rss.js
index d613b7d49670f333139cef1ab2e8a424f56b244f..39e5cecef60099585ed390b7bfdfb699b5c5c118 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -330,7 +330,8 @@ function init_second_stage() {
 
                loading_set_progress(30);
 
-               if (has_local_storage())
+               // can't use cache_clear() here because viewfeed might not have initialized yet
+               if ('sessionStorage' in window && window['sessionStorage'] !== null)
                        sessionStorage.clear();
 
                console.log("second stage ok");
@@ -350,6 +351,10 @@ function quickMenuGo(opid) {
                        displayDlg("printTagCloud");
                }
 
+               if (opid == "qmcTagSelect") {
+                       displayDlg("printTagSelect");
+               }
+
                if (opid == "qmcSearch") {
                        search();
                        return;
@@ -485,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;
@@ -516,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');
        }
 }
 
@@ -529,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) {
@@ -561,13 +564,11 @@ function collapse_feedlist() {
 }
 
 function viewModeChanged() {
-       cache_flush();
-       return viewCurrentFeed('')
+       return viewCurrentFeed('');
 }
 
 function viewLimitChanged() {
-       cache_flush();
-       return viewCurrentFeed('')
+       return viewCurrentFeed('');
 }
 
 /* function adjustArticleScore(id, score) {
@@ -625,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');
@@ -680,6 +681,11 @@ function hotkey_handler(e) {
 
                if (!hotkey_prefix) {
 
+                       if (keycode == 27) { // escape
+                               closeArticlePanel();
+                               return;
+                       }
+
                        if (keycode == 69) { // e
                                var id = getActiveArticleId();
                                emailArticle(id);
@@ -687,7 +693,7 @@ function hotkey_handler(e) {
 
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
-                                       Effect.Appear("hotkey_help_overlay", {duration : 0.3});
+                                       Effect.Appear("hotkey_help_overlay", {duration : 0.3, to : 0.9});
                                } else {
                                        Element.hide("hotkey_help_overlay");
                                }
@@ -699,7 +705,7 @@ function hotkey_handler(e) {
                                return false;
                        }
 
-                       if (keycode == 74) { // j
+                       if (keycode == 74 && !shift_key) { // j
                                var rv = dijit.byId("feedTree").getPreviousFeed(
                                                getActiveFeedId(), activeFeedIsCat());
 
@@ -772,7 +778,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 85) { // u
-                               selectionToggleUnread(undefined, false, true)
+                               selectionToggleUnread(undefined, false, true);
                                return;
                        }