X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/5c9d3612ac44a2da2624a911c97a4aa563679fed..10d593c6eecc49a8fe222ed2048c3f10e390b687:/src/editor/modules/documentCanvas/canvas/keyboard.js?ds=inline diff --git a/src/editor/modules/documentCanvas/canvas/keyboard.js b/src/editor/modules/documentCanvas/canvas/keyboard.js index 0b58443..cd12a02 100644 --- a/src/editor/modules/documentCanvas/canvas/keyboard.js +++ b/src/editor/modules/documentCanvas/canvas/keyboard.js @@ -50,11 +50,13 @@ handlers.push({key: KEYS.ENTER, if(Object.keys(cursor.getPosition()).length === 0) { var currentElement = canvas.getCurrentNodeElement(); if(currentElement) { + canvas.wlxmlDocument.startTransaction(); added = currentElement.data('wlxmlNode').after({ - tag: currentElement.getWlxmlTag() || 'div', + tagName: currentElement.getWlxmlTag() || 'div', attrs: {'class': currentElement.getWlxmlClass() || 'p'} }); added.append({text:''}); + canvas.wlxmlDocument.endTransaction(); canvas.setCurrentElement(utils.findCanvasElement(added), {caretTo: 'start'}); } return; @@ -65,10 +67,13 @@ handlers.push({key: KEYS.ENTER, if(element instanceof documentElement.DocumentTextElement) { element = element.parent(); } + + canvas.wlxmlDocument.startTransaction(); added = element.data('wlxmlNode').after( {tagName: element.getWlxmlTag() || 'div', attrs: {'class': element.getWlxmlClass() || 'p'}} ); added.append({text: ''}); + canvas.wlxmlDocument.endTransaction(); canvas.setCurrentElement(utils.findCanvasElement(added), {caretTo: 'start'}); } else { @@ -99,7 +104,7 @@ handlers.push({key: KEYS.ENTER, var result = position.element.data('wlxmlNode').breakContent({offset: position.offset}), goto, gotoOptions; if(result.emptyText) { - goto = result.createdEmpty; + goto = result.emptyText; gotoOptions = {}; } else { goto = result.second; @@ -134,18 +139,24 @@ handlers.push({keys: [KEYS.ARROW_UP, KEYS.ARROW_DOWN, KEYS.ARROW_LEFT, KEYS.ARRO caretTo = false; if(!element) { // Chrome hack - var direction; - if(event.which === KEYS.ARROW_LEFT || event.which === KEYS.ARROW_UP) { - direction = 'above'; - caretTo = 'end'; - } else { - direction = 'below'; - caretTo = 'start'; + + var moves = [{direction: 'above', caretTo: 'end'}, {direction: 'below', caretTo: 'start'}]; + if(event.which === KEYS.ARROW_RIGHT || event.which === KEYS.ARROW_DOWN) { + moves.reverse(); } - /* globals window */ - element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]:visible', direction, window.getSelection().focusNode)); + moves.some(function(move) { + /* globals window */ + var targetNode = utils.nearestInDocumentOrder('[document-text-element]:visible', move.direction, window.getSelection().focusNode); + if(targetNode) { + element = canvas.getDocumentElement(targetNode); + caretTo = move.caretTo; + return true; // break + } + }); + } + if(element) { + canvas.setCurrentElement(element, {caretTo: caretTo}); } - canvas.setCurrentElement(element, {caretTo: caretTo}); } }); @@ -169,7 +180,8 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE], keydown: function(event, canvas) { var cursor = canvas.getCursor(), position = canvas.getCursor().getPosition(), - element = position.element; + element = position.element, + node = element.data('wlxmlNode'); if(cursor.isSelecting() && !cursor.isSelectingWithinElement()) { event.preventDefault(); @@ -185,9 +197,11 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE], return element.getText().length === 1 || selectsWholeTextElement(cursor); }; + canvas.wlxmlDocument.startTransaction(); + if(willDeleteWholeText()) { event.preventDefault(); - element.setText(''); + node.setText(''); } else if(element.isEmpty()) { @@ -222,6 +236,8 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE], // todo event.preventDefault(); } + canvas.wlxmlDocument.endTransaction(); + } });