valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hotkeys: simplify prefix timeout handling

This commit is contained in:
Andrew Dolgov 2018-12-01 22:07:00 +03:00
parent b284e72d63
commit de9509cd31
4 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/feedlist.js
View File

@ -1,3 +1,5 @@
/* global notify,__,dijit */
const Feeds = { const Feeds = {
counters_last_request: 0, counters_last_request: 0,
_active_feed_id: 0, _active_feed_id: 0,
@ -208,7 +210,6 @@ const Feeds = {
Utils.setLoadingProgress(50); Utils.setLoadingProgress(50);
document.onkeydown = () => { App.hotkeyHandler(event) }; document.onkeydown = () => { App.hotkeyHandler(event) };
window.setInterval(() => { hotkeyPrefixTimeout() }, 3 * 1000);
window.setInterval(() => { Headlines.catchupBatchedArticles() }, 10 * 1000); window.setInterval(() => { Headlines.catchupBatchedArticles() }, 10 * 1000);
if (!this.getActiveFeedId()) { if (!this.getActiveFeedId()) {

50
js/functions.js
View File

@ -5,9 +5,6 @@ let _label_base_index = -1024;
let loading_progress = 0; let loading_progress = 0;
let notify_hide_timerid = false; let notify_hide_timerid = false;
let hotkey_prefix = 0;
let hotkey_prefix_pressed = false;
Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap( Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
function (callOriginal, options) { function (callOriginal, options) {
@ -58,6 +55,9 @@ Array.prototype.remove = function(s) {
const Utils = { const Utils = {
_rpc_seq: 0, _rpc_seq: 0,
hotkey_prefix: 0,
hotkey_prefix_pressed: false,
hotkey_prefix_timeout: 0,
next_seq: function() { next_seq: function() {
this._rpc_seq += 1; this._rpc_seq += 1;
return this._rpc_seq; return this._rpc_seq;
@ -75,30 +75,34 @@ const Utils = {
Element.hide("overlay"); Element.hide("overlay");
}, },
keyeventToAction: function(e) { keyeventToAction: function(event) {
const hotkeys_map = getInitParam("hotkeys"); const hotkeys_map = getInitParam("hotkeys");
const keycode = e.which; const keycode = event.which;
const keychar = String.fromCharCode(keycode).toLowerCase(); const keychar = String.fromCharCode(keycode).toLowerCase();
if (keycode == 27) { // escape and drop prefix if (keycode == 27) { // escape and drop prefix
hotkey_prefix = false; this.hotkey_prefix = false;
} }
if (keycode == 16 || keycode == 17) return; // ignore lone shift / ctrl if (keycode == 16 || keycode == 17) return; // ignore lone shift / ctrl
if (!hotkey_prefix && hotkeys_map[0].indexOf(keychar) != -1) { if (!this.hotkey_prefix && hotkeys_map[0].indexOf(keychar) != -1) {
const date = new Date(); const date = new Date();
const ts = Math.round(date.getTime() / 1000); const ts = Math.round(date.getTime() / 1000);
hotkey_prefix = keychar; this.hotkey_prefix = keychar;
hotkey_prefix_pressed = ts;
$("cmdline").innerHTML = keychar; $("cmdline").innerHTML = keychar;
Element.show("cmdline"); Element.show("cmdline");
e.stopPropagation(); window.clearTimeout(this.hotkey_prefix_timeout);
this.hotkey_prefix_timeout = window.setTimeout(() => {
this.hotkey_prefix = false;
Element.hide("cmdline");
}, 3 * 1000);
event.stopPropagation();
return false; return false;
} }
@ -108,13 +112,13 @@ const Utils = {
let hotkey_name = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")"; let hotkey_name = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")";
// ensure ^*char notation // ensure ^*char notation
if (e.shiftKey) hotkey_name = "*" + hotkey_name; if (event.shiftKey) hotkey_name = "*" + hotkey_name;
if (e.ctrlKey) hotkey_name = "^" + hotkey_name; if (event.ctrlKey) hotkey_name = "^" + hotkey_name;
if (e.altKey) hotkey_name = "+" + hotkey_name; if (event.altKey) hotkey_name = "+" + hotkey_name;
if (e.metaKey) hotkey_name = "%" + hotkey_name; if (event.metaKey) hotkey_name = "%" + hotkey_name;
const hotkey_full = hotkey_prefix ? hotkey_prefix + " " + hotkey_name : hotkey_name; const hotkey_full = this.hotkey_prefix ? this.hotkey_prefix + " " + hotkey_name : hotkey_name;
hotkey_prefix = false; this.hotkey_prefix = false;
let action_name = false; let action_name = false;
@ -1008,18 +1012,6 @@ function strip_tags(s) {
return s.replace(/<\/?[^>]+(>|$)/g, ""); return s.replace(/<\/?[^>]+(>|$)/g, "");
} }
function hotkeyPrefixTimeout() {
const date = new Date();
const ts = Math.round(date.getTime() / 1000);
if (hotkey_prefix_pressed && ts - hotkey_prefix_pressed >= 5) {
console.log("hotkey_prefix seems to be stuck, aborting");
hotkey_prefix_pressed = false;
hotkey_prefix = false;
Element.hide('cmdline');
}
}
// noinspection JSUnusedGlobalSymbols // noinspection JSUnusedGlobalSymbols
function uploadIconHandler(rc) { function uploadIconHandler(rc) {
switch (rc) { switch (rc) {

2
js/prefs.js
View File

@ -85,8 +85,6 @@ const App = {
editFeed(param) editFeed(param)
}, 100); }, 100);
} }
setInterval(() => { hotkeyPrefixTimeout() }, 5 * 1000);
}, },
hotkeyHandler: function (event) { hotkeyHandler: function (event) {
if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return; if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;

2
js/viewfeed.js
View File

@ -1,4 +1,4 @@
/* global dijit, __, ngettext */ /* global dijit, __, ngettext, notify */
const ArticleCache = { const ArticleCache = {
has_storage: 'sessionStorage' in window && window['sessionStorage'] !== null, has_storage: 'sessionStorage' in window && window['sessionStorage'] !== null,