From d9d8f2055ff34b2c5e2ca7167c9728ecd3e0bb19 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 7 Aug 2017 16:23:37 +0100
Subject: [PATCH] Allow default for ctrl+shift+b, ctrl+shift+u in RTE

fixes vector-im/riot-web#4750
---
 src/components/views/rooms/MessageComposerInput.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c16348300f..68df8fce57 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -104,7 +104,11 @@ export default class MessageComposerInput extends React.Component {
         }
 
         // Allow opening of dev tools. getDefaultKeyBinding would be 'italic' for KEY_I
-        if (e.keyCode === KeyCode.KEY_I && e.shiftKey && e.ctrlKey) {
+        // Likewise protect bold and underline (in case some browsers use these as
+        // shortcuts for things).
+        if ([KeyCode.KEY_B, KeyCode.KEY_I, KeyCode.KEY_U].includes(e.keyCode) &&
+            e.shiftKey && e.ctrlKey
+        ) {
             // When null is returned, draft-js will NOT preventDefault, allowing dev tools
             // to be toggled when the editor is focussed
             return null;