diff options
Diffstat (limited to 'lib/scripts/editor.js')
| -rw-r--r-- | lib/scripts/editor.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js index 74919cb98..fac084489 100644 --- a/lib/scripts/editor.js +++ b/lib/scripts/editor.js @@ -124,14 +124,15 @@ var dw_editor = { * Listens to all key inputs and handle indentions * of lists and code blocks * - * Currently handles space, backspce and enter presses + * Currently handles space, backspace, enter and + * ctrl-enter presses * * @author Andreas Gohr <andi@splitbrain.org> * @fixme handle tabs * @param event e - the key press event object */ keyHandler: function(e){ - if(jQuery.inArray(e.keyCode,[8, 13, 32]) === -1) { + if(jQuery.inArray(e.keyCode,[8, 10, 13, 32]) === -1) { return; } var selection = DWgetSelection(this); @@ -143,7 +144,12 @@ var dw_editor = { search.lastIndexOf("\r")); //IE workaround search = search.substr(linestart); - if(e.keyCode == 13){ // Enter + if((e.keyCode == 13 || e.keyCode == 10) && e.ctrlKey) { // Ctrl-Enter (With Chrome workaround) + // Submit current edit + jQuery('#edbtn__save').click(); + e.preventDefault(); // prevent enter key + return false; + }else if(e.keyCode == 13){ // Enter // keep current indention for lists and code var match = search.match(/(\n +([\*-] ?)?)/); if(match){ |