From 7b26cae765f48679319ce3909f2837b22a4ba55b 2011-08-30 16:51:06 From: Brian E. Granger Date: 2011-08-30 16:51:06 Subject: [PATCH] Fixing Ctrl-Enter on Firefox. --- diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/js/codecell.js index 2347dc8..8a4da1b 100644 --- a/IPython/frontend/html/notebook/static/js/codecell.js +++ b/IPython/frontend/html/notebook/static/js/codecell.js @@ -51,7 +51,7 @@ var IPython = (function (IPython) { // This method gets called in CodeMirror's onKeyDown/onKeyPress handlers and // is used to provide custom key handling. Its return value is used to determine // if CodeMirror should ignore the event: true = ignore, false = don't ignore. - if (event.keyCode === 13 && event.shiftKey) { + if (event.keyCode === 13 && (event.shiftKey || event.ctrlKey)) { // Always ignore shift-enter in CodeMirror as we handle it. return true; } else if (event.keyCode === 9 && event.type == 'keydown') {