mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-22 08:26:16 -04:00
Merge pull request #2891 from bhldev/padShortcutDisable
Added pad shortcut disabling feature to settings.json
This commit is contained in:
commit
1ebcf0dc47
4 changed files with 110 additions and 22 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue