summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2015-05-07 15:55:52 +0000
committerJohn McLear <john@mclear.co.uk>2015-05-07 15:55:52 +0000
commit975bd99064ff2669aa4b64c7bb06754418158e70 (patch)
treee0e1feb49fc23455dcbbc66bb2f3917f89e90a50 /src
parentb8192fd0155066ebe605345de082a9d6c9f09e68 (diff)
downloadetherpad-lite-975bd99064ff2669aa4b64c7bb06754418158e70.zip
support for french stuff
Diffstat (limited to 'src')
-rw-r--r--src/static/js/ace2_inner.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index bcb30623..e2e1128c 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3889,7 +3889,7 @@ function Ace2Inner(){
toggleAttributeOnSelection('underline');
specialHandled = true;
}
- if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "5" && (evt.metaKey || evt.ctrlKey))
+ if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "5" && (evt.metaKey || evt.ctrlKey) && evt.altKey !== true)
{
// cmd-5 (strikethrough)
fastIncorp(13);