From: Aleksander Ɓukasz Date: Fri, 24 Jan 2014 09:35:02 +0000 (+0100) Subject: editor: Handle hitting backspace/delete on arbitrary selection X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/cd106525cca6355309617b7a7092bd58cb9d8ce8?hp=df1aaa5ae8434788bb67662782fe7e5324ac9786 editor: Handle hitting backspace/delete on arbitrary selection --- diff --git a/src/editor/modules/documentCanvas/canvas/keyboard.js b/src/editor/modules/documentCanvas/canvas/keyboard.js index 65f8f6b..58036c4 100644 --- a/src/editor/modules/documentCanvas/canvas/keyboard.js +++ b/src/editor/modules/documentCanvas/canvas/keyboard.js @@ -182,10 +182,52 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE], position = canvas.getCursor().getPosition(), element = position.element, node = element.data('wlxmlNode'), + direction = 'above', + caretTo = 'end', goto; + + if(event.which === KEYS.DELETE) { + direction = 'below'; + caretTo = 'start'; + } + if(cursor.isSelecting() && !cursor.isSelectingWithinElement()) { event.preventDefault(); + var start = cursor.getSelectionStart(), + end = cursor.getSelectionEnd(); + + if(direction === 'above') { + if(start.offsetAtBeginning) { + goto = start.element.getNearestTextElement('above'); + caretTo = 'end'; + } else { + goto = start.element; + caretTo = start.offset; + } + } else { + if(end.offsetAtEnd) { + goto = start.element.getNearestTextElement('below'); + caretTo = 'start'; + } else { + goto = end.element; + caretTo = 0; + } + } + + canvas.wlxmlDocument.deleteText({ + from: { + node: start.element.data('wlxmlNode'), + offset: start.offset + }, + to: { + node: end.element.data('wlxmlNode'), + offset: end.offset + } + }); + if(goto) { + canvas.setCurrentElement(goto, {caretTo: caretTo}); + } return; } @@ -200,13 +242,7 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE], canvas.wlxmlDocument.startTransaction(); - var direction = 'above', - caretTo = 'end'; - - if(event.which === KEYS.DELETE) { - direction = 'below'; - caretTo = 'start'; - } + if(willDeleteWholeText()) { event.preventDefault();