summaryrefslogtreecommitdiff
path: root/src/node
diff options
context:
space:
mode:
authorLuiza Pagliari <lpagliari@gmail.com>2017-05-11 11:29:25 -0300
committerGitHub <noreply@github.com>2017-05-11 11:29:25 -0300
commit1ebcf0dc470985ddc4357b0ac54e886116dfa3df (patch)
treec5836ed85b4fb6968c0055c1816ed676afbe5f60 /src/node
parentef415880f0e42a670897410af50b186934098d04 (diff)
parent26aeb7b7054a2e7b24aa691a7d47e57ad5e08fdc (diff)
downloadetherpad-lite-1ebcf0dc470985ddc4357b0ac54e886116dfa3df.zip
Merge pull request #2891 from bhldev/padShortcutDisable
Added pad shortcut disabling feature to settings.json
Diffstat (limited to 'src/node')
-rw-r--r--src/node/hooks/express/specialpages.js6
-rw-r--r--src/node/utils/Settings.js28
2 files changed, 33 insertions, 1 deletions
diff --git a/src/node/hooks/express/specialpages.js b/src/node/hooks/express/specialpages.js
index 2840f82c..e933a05a 100644
--- a/src/node/hooks/express/specialpages.js
+++ b/src/node/hooks/express/specialpages.js
@@ -48,6 +48,12 @@ exports.expressCreateServer = function (hook_name, args, cb) {
res.cookie('language', settings.padOptions.lang);
}
+ // Enable the pad shortcut keys from settings.json
+ if (settings.padShortcutEnabled !== undefined)
+ {
+ res.cookie('padShortcutEnabled', JSON.stringify(settings.padShortcutEnabled));
+ }
+
// The below might break for pads being rewritten
var isReadOnly = req.url.indexOf("/p/r.") === 0;
diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index a564501d..5060d28f 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -100,7 +100,33 @@ exports.padOptions = {
"alwaysShowChat": false,
"chatAndUsers": false,
"lang": "en-gb"
-}
+},
+
+/**
+ * Whether certain shortcut keys are enabled for a user in the pad
+ */
+exports.padShortcutEnabled = {
+ "altF9" : true,
+ "altC" : true,
+ "delete" : true,
+ "cmdShift2" : true,
+ "return" : true,
+ "cmdS" : true,
+ "tab" : true,
+ "cmdZ" : true,
+ "cmdY" : true,
+ "cmdB" : true,
+ "cmdI" : true,
+ "cmdU" : true,
+ "cmd5" : true,
+ "cmdShiftL" : true,
+ "cmdShiftN" : true,
+ "cmdShiftC" : true,
+ "cmdH" : true,
+ "ctrlHome" : true,
+ "pageUp" : true,
+ "pageDown" : true,
+},
/**
* The toolbar buttons and order.