diff options
| author | Luiza Pagliari <lpagliari@gmail.com> | 2017-05-11 11:29:25 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-11 11:29:25 -0300 |
| commit | 1ebcf0dc470985ddc4357b0ac54e886116dfa3df (patch) | |
| tree | c5836ed85b4fb6968c0055c1816ed676afbe5f60 /src/node/hooks | |
| parent | ef415880f0e42a670897410af50b186934098d04 (diff) | |
| parent | 26aeb7b7054a2e7b24aa691a7d47e57ad5e08fdc (diff) | |
| download | etherpad-lite-1ebcf0dc470985ddc4357b0ac54e886116dfa3df.zip | |
Merge pull request #2891 from bhldev/padShortcutDisable
Added pad shortcut disabling feature to settings.json
Diffstat (limited to 'src/node/hooks')
| -rw-r--r-- | src/node/hooks/express/specialpages.js | 6 |
1 files changed, 6 insertions, 0 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; |