diff options
| author | Luiza Pagliari <lpagliari@gmail.com> | 2017-05-11 14:56:09 -0300 |
|---|---|---|
| committer | Luiza Pagliari <lpagliari@gmail.com> | 2017-05-11 14:56:09 -0300 |
| commit | 0cb8d31e9569c3b80fb5847a664f28188f67a2ff (patch) | |
| tree | ac4f0fb1c963cab160708e10593d156f05e8c06a /src | |
| parent | 97038c2183c9f2c6f427825e121f841db01eb1c8 (diff) | |
| download | etherpad-lite-0cb8d31e9569c3b80fb5847a664f28188f67a2ff.zip | |
[fix] Have one setting for each shortcut to create ordered list
This is an adjustment to #2891.
Diffstat (limited to 'src')
| -rw-r--r-- | src/node/utils/Settings.js | 1 | ||||
| -rw-r--r-- | src/static/js/ace2_inner.js | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index e9b02449..660b7afb 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -122,6 +122,7 @@ exports.padShortcutEnabled = { "cmd5" : true, "cmdShiftL" : true, "cmdShiftN" : true, + "cmdShift1" : true, "cmdShiftC" : true, "cmdH" : true, "ctrlHome" : true, diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index a0030c62..b3759e52 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3939,9 +3939,9 @@ function Ace2Inner(){ doInsertUnorderedList() specialHandled = true; } - if ((!specialHandled) && isTypeForCmdKey && (String.fromCharCode(which).toLowerCase() == "n" || String.fromCharCode(which) == 1) && (evt.metaKey || evt.ctrlKey) && evt.shiftKey && padShortcutEnabled.cmdShiftN) + if ((!specialHandled) && isTypeForCmdKey && ((String.fromCharCode(which).toLowerCase() == "n" && padShortcutEnabled.cmdShiftN) || (String.fromCharCode(which) == 1 && padShortcutEnabled.cmdShift1)) && (evt.metaKey || evt.ctrlKey) && evt.shiftKey) { - // cmd-shift-N (orderedlist) + // cmd-shift-N and cmd-shift-1 (orderedlist) fastIncorp(9); evt.preventDefault(); doInsertOrderedList() |