remove duplicated code from hotkey actions handler
more xhrPost() refactoring
This commit is contained in:
Andrew Dolgov
parent
24c618dd6f
commit
7e8be97b66
|
|
@ -175,7 +175,7 @@ function feedlist_init() {
|
|||
loading_set_progress(50);
|
||||
|
||||
document.onkeydown = hotkey_handler;
|
||||
setTimeout(hotkey_prefix_timeout, 5*1000);
|
||||
setInterval(hotkey_prefix_timeout, 5*1000);
|
||||
|
||||
if (!getActiveFeedId()) {
|
||||
viewfeed({feed: -3});
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@ let _label_base_index = -1024;
|
|||
let loading_progress = 0;
|
||||
let notify_hide_timerid = false;
|
||||
|
||||
let hotkey_prefix = 0;
|
||||
let hotkey_prefix_pressed = false;
|
||||
|
||||
Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
|
||||
function (callOriginal, options) {
|
||||
|
||||
|
|
@ -27,14 +30,14 @@ Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
|
|||
|
||||
function xhrPost(url, params, complete) {
|
||||
console.log("xhrPost:", params);
|
||||
new Ajax.Request(url, {
|
||||
return new Ajax.Request(url, {
|
||||
parameters: params,
|
||||
onComplete: complete
|
||||
});
|
||||
}
|
||||
|
||||
function xhrJson(url, params, complete) {
|
||||
xhrPost(url, params, (reply) => {
|
||||
return xhrPost(url, params, (reply) => {
|
||||
try {
|
||||
const obj = JSON.parse(reply.responseText);
|
||||
complete(obj);
|
||||
|
|
@ -498,9 +501,6 @@ function hotkey_prefix_timeout() {
|
|||
hotkey_prefix = false;
|
||||
Element.hide('cmdline');
|
||||
}
|
||||
|
||||
setTimeout(hotkey_prefix_timeout, 1000);
|
||||
|
||||
}
|
||||
|
||||
function uploadIconHandler(rc) {
|
||||
|
|
@ -1087,8 +1087,25 @@ function backend_sanity_check_callback(transport) {
|
|||
console.log('reading init-params...');
|
||||
|
||||
for (const k in params) {
|
||||
switch (k) {
|
||||
case "label_base_index":
|
||||
_label_base_index = parseInt(params[k])
|
||||
break;
|
||||
case "hotkeys":
|
||||
// filter mnemonic definitions (used for help panel) from hotkeys map
|
||||
// i.e. *(191)|Ctrl-/ -> *(191)
|
||||
|
||||
const tmp = [];
|
||||
for (const sequence in params[k][1]) {
|
||||
const filtered = sequence.replace(/\|.*$/, "");
|
||||
tmp[filtered] = params[k][1][sequence];
|
||||
}
|
||||
|
||||
params[k][1] = tmp;
|
||||
break;
|
||||
}
|
||||
|
||||
console.log("IP:", k, "=>", params[k]);
|
||||
if (k == "label_base_index") _label_base_index = parseInt(params[k]);
|
||||
}
|
||||
|
||||
init_params = params;
|
||||
|
|
@ -1537,3 +1554,58 @@ function openArticlePopup(id) {
|
|||
w.opener = null;
|
||||
w.location = "backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + "&csrf_token=" + getInitParam("csrf_token");
|
||||
}
|
||||
|
||||
function keyevent_to_action(e) {
|
||||
|
||||
const hotkeys_map = getInitParam("hotkeys");
|
||||
const keycode = e.which;
|
||||
const keychar = String.fromCharCode(keycode).toLowerCase();
|
||||
|
||||
if (keycode == 27) { // escape and drop prefix
|
||||
hotkey_prefix = false;
|
||||
}
|
||||
|
||||
if (keycode == 16 || keycode == 17) return; // ignore lone shift / ctrl
|
||||
|
||||
if (!hotkey_prefix && hotkeys_map[0].indexOf(keychar) != -1) {
|
||||
|
||||
const date = new Date();
|
||||
const ts = Math.round(date.getTime() / 1000);
|
||||
|
||||
hotkey_prefix = keychar;
|
||||
hotkey_prefix_pressed = ts;
|
||||
|
||||
$("cmdline").innerHTML = keychar;
|
||||
Element.show("cmdline");
|
||||
|
||||
e.stopPropagation();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
Element.hide("cmdline");
|
||||
|
||||
let hotkey_name = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")";
|
||||
|
||||
// ensure ^*char notation
|
||||
if (e.shiftKey) hotkey_name = "*" + hotkey_name;
|
||||
if (e.ctrlKey) hotkey_name = "^" + hotkey_name;
|
||||
if (e.altKey) hotkey_name = "+" + hotkey_name;
|
||||
if (e.metaKey) hotkey_name = "%" + hotkey_name;
|
||||
|
||||
const hotkey_full = hotkey_prefix ? hotkey_prefix + " " + hotkey_name : hotkey_name;
|
||||
hotkey_prefix = false;
|
||||
|
||||
let action_name = false;
|
||||
|
||||
for (const sequence in hotkeys_map[1]) {
|
||||
if (sequence == hotkey_full) {
|
||||
action_name = hotkeys_map[1][sequence];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
console.log('keyevent_to_action', hotkey_full, '=>', action_name);
|
||||
|
||||
return action_name;
|
||||
}
|
||||
144
js/prefs.js
144
js/prefs.js
|
|
@ -1,8 +1,5 @@
|
|||
/* global dijit, __ */
|
||||
|
||||
let hotkey_prefix = false;
|
||||
let hotkey_prefix_pressed = false;
|
||||
|
||||
let seq = "";
|
||||
|
||||
function notify_callback2(transport, sticky) {
|
||||
|
|
@ -494,18 +491,10 @@ function editSelectedFeeds() {
|
|||
|
||||
notify_progress("Loading, please wait...");
|
||||
|
||||
const query = "backend.php?op=pref-feeds&method=editfeeds&ids=" +
|
||||
param_escape(rows.toString());
|
||||
|
||||
console.log(query);
|
||||
|
||||
if (dijit.byId("feedEditDlg"))
|
||||
dijit.byId("feedEditDlg").destroyRecursive();
|
||||
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: query,
|
||||
onComplete: function (transport) {
|
||||
|
||||
xhrPost("backend.php", { op: "pref-feeds", method: "editfeeds", ids: rows.toString() }, (transport) => {
|
||||
notify("");
|
||||
|
||||
const dialog = new dijit.Dialog({
|
||||
|
|
@ -558,8 +547,6 @@ function editSelectedFeeds() {
|
|||
});
|
||||
|
||||
dialog.show();
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -613,57 +600,58 @@ function updateFilterList() {
|
|||
let search = "";
|
||||
if (user_search) { search = user_search.value; }
|
||||
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: "?op=pref-filters&search=" + param_escape(search),
|
||||
onComplete: function(transport) {
|
||||
xhrPost("backend.php", { op: "pref-filters", search: search }, (transport) => {
|
||||
dijit.byId('filterConfigTab').attr('content', transport.responseText);
|
||||
notify("");
|
||||
} });
|
||||
});
|
||||
}
|
||||
|
||||
function updateLabelList() {
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: "?op=pref-labels",
|
||||
onComplete: function(transport) {
|
||||
xhrPost("backend.php", { op: "pref-labels" }, (transport) => {
|
||||
dijit.byId('labelConfigTab').attr('content', transport.responseText);
|
||||
notify("");
|
||||
} });
|
||||
});
|
||||
}
|
||||
|
||||
function updatePrefsList() {
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: "?op=pref-prefs",
|
||||
onComplete: function(transport) {
|
||||
xhrPost("backend.php", { op: "pref-prefs" }, (transport) => {
|
||||
dijit.byId('genConfigTab').attr('content', transport.responseText);
|
||||
notify("");
|
||||
} });
|
||||
});
|
||||
}
|
||||
|
||||
function updateSystemList() {
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: "?op=pref-system",
|
||||
onComplete: function(transport) {
|
||||
xhrPost("backend.php", { op: "pref-system" }, (transport) => {
|
||||
dijit.byId('systemConfigTab').attr('content', transport.responseText);
|
||||
notify("");
|
||||
} });
|
||||
});
|
||||
}
|
||||
|
||||
function selectTab(id, noupdate) {
|
||||
if (!noupdate) {
|
||||
notify_progress("Loading, please wait...");
|
||||
|
||||
if (id == "feedConfig") {
|
||||
switch (id) {
|
||||
case "feedConfig":
|
||||
updateFeedList();
|
||||
} else if (id == "filterConfig") {
|
||||
break;
|
||||
case "filterConfig":
|
||||
updateFilterList();
|
||||
} else if (id == "labelConfig") {
|
||||
break;
|
||||
case "labelConfig":
|
||||
updateLabelList();
|
||||
} else if (id == "genConfig") {
|
||||
break;
|
||||
case "genConfig":
|
||||
updatePrefsList();
|
||||
} else if (id == "userConfig") {
|
||||
break;
|
||||
case "userConfig":
|
||||
updateUsersList();
|
||||
} else if (id == "systemConfig") {
|
||||
break;
|
||||
case "systemConfig":
|
||||
updateSystemList();
|
||||
break;
|
||||
default:
|
||||
console.warn("unknown tab", id);
|
||||
}
|
||||
|
||||
const tab = dijit.byId(id + "Tab");
|
||||
|
|
@ -692,7 +680,7 @@ function init_second_stage() {
|
|||
window.setTimeout(function() { editFeed(param) }, 100);
|
||||
}
|
||||
|
||||
setTimeout(hotkey_prefix_timeout, 5*1000);
|
||||
setInterval(hotkey_prefix_timeout, 5*1000);
|
||||
}
|
||||
|
||||
function init() {
|
||||
|
|
@ -765,91 +753,26 @@ function init() {
|
|||
|
||||
|
||||
function validatePrefsReset() {
|
||||
const ok = confirm(__("Reset to defaults?"));
|
||||
|
||||
if (ok) {
|
||||
if (confirm(__("Reset to defaults?"))) {
|
||||
|
||||
const query = "?op=pref-prefs&method=resetconfig";
|
||||
console.log(query);
|
||||
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: query,
|
||||
onComplete: function(transport) {
|
||||
xhrPost("backend.php", { op: "pref-prefs", method: "resetconfig" }, (transport) => {
|
||||
updatePrefsList();
|
||||
notify_info(transport.responseText);
|
||||
} });
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
function pref_hotkey_handler(e) {
|
||||
|
||||
if (e.target.nodeName == "INPUT" || e.target.nodeName == "TEXTAREA") return;
|
||||
|
||||
let keycode = false;
|
||||
let shift_key = false;
|
||||
const action_name = keyevent_to_action(e);
|
||||
|
||||
const cmdline = $('cmdline');
|
||||
|
||||
try {
|
||||
shift_key = e.shiftKey;
|
||||
} catch (e) {
|
||||
|
||||
}
|
||||
|
||||
if (window.event) {
|
||||
keycode = window.event.keyCode;
|
||||
} else if (e) {
|
||||
keycode = e.which;
|
||||
}
|
||||
|
||||
let keychar = String.fromCharCode(keycode);
|
||||
|
||||
if (keycode == 27) { // escape
|
||||
hotkey_prefix = false;
|
||||
}
|
||||
|
||||
if (keycode == 16) return; // ignore lone shift
|
||||
if (keycode == 17) return; // ignore lone ctrl
|
||||
|
||||
if (!shift_key) keychar = keychar.toLowerCase();
|
||||
|
||||
var hotkeys = getInitParam("hotkeys");
|
||||
|
||||
if (!hotkey_prefix && hotkeys[0].indexOf(keychar) != -1) {
|
||||
|
||||
const date = new Date();
|
||||
const ts = Math.round(date.getTime() / 1000);
|
||||
|
||||
hotkey_prefix = keychar;
|
||||
hotkey_prefix_pressed = ts;
|
||||
|
||||
cmdline.innerHTML = keychar;
|
||||
Element.show(cmdline);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Element.hide(cmdline);
|
||||
|
||||
let hotkey = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")";
|
||||
hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey;
|
||||
hotkey_prefix = false;
|
||||
|
||||
let hotkey_action = false;
|
||||
var hotkeys = getInitParam("hotkeys");
|
||||
|
||||
for (const sequence in hotkeys[1]) {
|
||||
if (sequence == hotkey) {
|
||||
hotkey_action = hotkeys[1][sequence];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
switch (hotkey_action) {
|
||||
if (action_name) {
|
||||
switch (action_name) {
|
||||
case "feed_subscribe":
|
||||
quickAddFeed();
|
||||
return false;
|
||||
|
|
@ -860,10 +783,11 @@ function pref_hotkey_handler(e) {
|
|||
quickAddFilter();
|
||||
return false;
|
||||
case "help_dialog":
|
||||
//helpDialog("prefs");
|
||||
helpDialog("main");
|
||||
return false;
|
||||
default:
|
||||
console.log("unhandled action: " + hotkey_action + "; hotkey: " + hotkey);
|
||||
console.log("unhandled action: " + action_name + "; keycode: " + e.which);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
67
js/tt-rss.js
67
js/tt-rss.js
|
|
@ -1,13 +1,11 @@
|
|||
/* global dijit, __ */
|
||||
|
||||
let global_unread = -1;
|
||||
let hotkey_prefix = false;
|
||||
let hotkey_prefix_pressed = false;
|
||||
let hotkey_actions = {};
|
||||
let _widescreen_mode = false;
|
||||
let _rpc_seq = 0;
|
||||
let _active_feed_id = 0;
|
||||
let _active_feed_is_cat = false;
|
||||
let hotkey_actions = {};
|
||||
|
||||
function next_seq() {
|
||||
_rpc_seq += 1;
|
||||
|
|
@ -596,7 +594,7 @@ function init_second_stage() {
|
|||
if ('sessionStorage' in window && window['sessionStorage'] !== null)
|
||||
sessionStorage.clear();
|
||||
|
||||
const hotkeys = getInitParam("hotkeys");
|
||||
/*const hotkeys = getInitParam("hotkeys");
|
||||
const tmp = [];
|
||||
|
||||
for (const sequence in hotkeys[1]) {
|
||||
|
|
@ -605,7 +603,7 @@ function init_second_stage() {
|
|||
}
|
||||
|
||||
hotkeys[1] = tmp;
|
||||
setInitParam("hotkeys", hotkeys);
|
||||
setInitParam("hotkeys", hotkeys);*/
|
||||
|
||||
_widescreen_mode = getInitParam("widescreen");
|
||||
switchPanelMode(_widescreen_mode);
|
||||
|
|
@ -767,66 +765,19 @@ function viewModeChanged() {
|
|||
}
|
||||
|
||||
function hotkey_handler(e) {
|
||||
|
||||
if (e.target.nodeName == "INPUT" || e.target.nodeName == "TEXTAREA") return;
|
||||
|
||||
let keycode = e.which;
|
||||
const action_name = keyevent_to_action(e);
|
||||
|
||||
if (keycode == 27) { // escape and drop prefix
|
||||
hotkey_prefix = false;
|
||||
}
|
||||
if (action_name) {
|
||||
const action_func = hotkey_actions[action_name];
|
||||
|
||||
if (keycode == 16 || keycode == 17) return; // ignore lone shift / ctrl
|
||||
|
||||
const hotkeys = getInitParam("hotkeys");
|
||||
const keychar = String.fromCharCode(keycode).toLowerCase();
|
||||
|
||||
if (!hotkey_prefix && hotkeys[0].indexOf(keychar) != -1) {
|
||||
|
||||
const date = new Date();
|
||||
const ts = Math.round(date.getTime() / 1000);
|
||||
|
||||
hotkey_prefix = keychar;
|
||||
hotkey_prefix_pressed = ts;
|
||||
|
||||
$("cmdline").innerHTML = keychar;
|
||||
Element.show("cmdline");
|
||||
|
||||
e.stopPropagation();
|
||||
|
||||
// returning false here literally disables ctrl-c in browser lol (because C is a valid prefix)
|
||||
return true;
|
||||
}
|
||||
|
||||
Element.hide("cmdline");
|
||||
|
||||
let hotkey = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")";
|
||||
|
||||
// ensure ^*char notation
|
||||
if (e.shiftKey) hotkey = "*" + hotkey;
|
||||
if (e.ctrlKey) hotkey = "^" + hotkey;
|
||||
if (e.altKey) hotkey = "+" + hotkey;
|
||||
if (e.metaKey) hotkey = "%" + hotkey;
|
||||
|
||||
hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey;
|
||||
hotkey_prefix = false;
|
||||
|
||||
let hotkey_action = false;
|
||||
|
||||
for (const sequence in hotkeys[1]) {
|
||||
if (sequence == hotkey) {
|
||||
hotkey_action = hotkeys[1][sequence];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
const action = hotkey_actions[hotkey_action];
|
||||
|
||||
if (action != null) {
|
||||
action();
|
||||
if (action_func != null) {
|
||||
action_func();
|
||||
e.stopPropagation();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function inPreferences() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue