X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/4ddf36452af460dbc26fd181f2ba3640a7c71374..83989a968f6af8436bbb37f7a67b82b35a26a2ed:/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 16f2f68..85fbd43 100644 --- a/src/editor/modules/documentCanvas/canvas/keyboard.js +++ b/src/editor/modules/documentCanvas/canvas/keyboard.js @@ -27,10 +27,12 @@ var handleKey = function(event, canvas) { }; var handles = function(handler, event) { - if(handler.key === event.which) + if(handler.key === event.which) { return true; - if(handler.keys && handler.keys.indexOf(event.which) !== -1) + } + if(handler.keys && handler.keys.indexOf(event.which) !== -1) { return true; + } return false; }; @@ -42,16 +44,19 @@ handlers.push({key: KEYS.ENTER, event.preventDefault(); var cursor = canvas.getCursor(), position = cursor.getPosition(), - element = position.element; + element = position.element, + added; if(Object.keys(cursor.getPosition()).length === 0) { var currentElement = canvas.getCurrentNodeElement(); if(currentElement) { - var added = currentElement.data('wlxmlNode').after({ - tag: currentElement.getWlxmlTag() || 'div', + canvas.wlxmlDocument.startTransaction(); + added = currentElement.data('wlxmlNode').after({ + tagName: currentElement.getWlxmlTag() || 'div', attrs: {'class': currentElement.getWlxmlClass() || 'p'} }); added.append({text:''}); + canvas.wlxmlDocument.endTransaction(); canvas.setCurrentElement(utils.findCanvasElement(added), {caretTo: 'start'}); } return; @@ -62,10 +67,13 @@ handlers.push({key: KEYS.ENTER, if(element instanceof documentElement.DocumentTextElement) { element = element.parent(); } - var added = element.data('wlxmlNode').after( + + 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 { @@ -74,21 +82,32 @@ handlers.push({key: KEYS.ENTER, return false; // top level element is unsplittable } - var nodes = position.element.data('wlxmlNode').split({offset: position.offset}), - newEmpty, - goto, - gotoOptions; + //var nodes = position.element.data('wlxmlNode').split({offset: position.offset}), + // var nodes = position.element.data('wlxmlNode').transform('split', {offset: position.offset}), + // newEmpty, + // goto, + // gotoOptions; - if(position.offsetAtBeginning) - newEmpty = nodes.first; - else if(position.offsetAtEnd) - newEmpty = nodes.second; + // if(position.offsetAtBeginning) + // newEmpty = nodes.first; + // else if(position.offsetAtEnd) + // newEmpty = nodes.second; - if(newEmpty) { - goto = newEmpty.append({text: ''}); + // if(newEmpty) { + // //goto = newEmpty.append({text: ''}); + // gotoOptions = {}; + // } else { + // goto = nodes.second; + // gotoOptions = {caretTo: 'start'}; + // } + + var result = position.element.data('wlxmlNode').breakContent({offset: position.offset}), + goto, gotoOptions; + if(result.emptyText) { + goto = result.emptyText; gotoOptions = {}; } else { - goto = nodes.second; + goto = result.second; gotoOptions = {caretTo: 'start'}; } @@ -112,7 +131,9 @@ handlers.push({keys: [KEYS.ARROW_UP, KEYS.ARROW_DOWN, KEYS.ARROW_LEFT, KEYS.ARRO caretTo = 'start'; } var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0])); - canvas.setCurrentElement(el, {caretTo: caretTo}); + if(el) { + canvas.setCurrentElement(el, {caretTo: caretTo}); + } } }, keyup: function(event, canvas) { @@ -120,31 +141,40 @@ 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(); } - 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}); } }); var selectsWholeTextElement = function(cursor) { - if(cursor.isSelecting() && cursor.getSelectionStart().offsetAtBeginning && cursor.getSelectionEnd().offsetAtEnd) + if(cursor.isSelecting() && cursor.getSelectionStart().offsetAtBeginning && cursor.getSelectionEnd().offsetAtEnd) { return true; + } return false; -} +}; handlers.push({key: KEYS.X, keydown: function(event, canvas) { - if(event.ctrlKey && selectsWholeTextElement(canvas.getCursor())) + if(event.ctrlKey && selectsWholeTextElement(canvas.getCursor())) { event.preventDefault(); + } } }); @@ -152,10 +182,54 @@ 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'), + 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; } @@ -166,45 +240,44 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE], var willDeleteWholeText = function() { return element.getText().length === 1 || selectsWholeTextElement(cursor); - } - - if(willDeleteWholeText()) { - event.preventDefault(); - element.setText(''); - } - else if(element.isEmpty()) { + }; - var direction = 'above', - caretTo = 'end'; - - if(event.which === KEYS.DELETE) { - direction = 'below'; - caretTo = 'start'; + canvas.wlxmlDocument.transaction(function() { + if(willDeleteWholeText()) { + event.preventDefault(); + node.setText(''); } - - event.preventDefault(); - - var parent = element.parent(), - grandParent = parent ? parent.parent() : null, - goto; - if(parent.children().length === 1 && parent.children()[0].sameNode(element)) { - if(grandParent && grandParent.children().length === 1) { - goto = grandParent.data('wlxmlNode').append({text: ''}); + else if(element.isEmpty()) { + event.preventDefault(); + var parent = element.parent(), + grandParent = parent ? parent.parent() : null; + if(!grandParent && parent.children().length === 1) { + return; + } + if(parent.children().length === 1 && parent.children()[0].sameNode(element)) { + if(grandParent && grandParent.children().length === 1) { + goto = grandParent.data('wlxmlNode').append({text: ''}); + } else { + goto = element.getNearestTextElement(direction); + } + parent.data('wlxmlNode').detach(); } else { goto = element.getNearestTextElement(direction); + element.data('wlxmlNode').detach(); } - parent.data('wlxmlNode').detach(); - } else { - goto = element.getNearestTextElement(direction); - element.data('wlxmlNode').detach(); + canvas.setCurrentElement(goto, {caretTo: caretTo}); } - canvas.setCurrentElement(goto, {caretTo: caretTo}); - canvas.publisher('contentChanged'); - } - else if(cursorAtOperationEdge) { - // todo - event.preventDefault(); - } + else if(cursorAtOperationEdge) { + if(direction === 'below') { + element = element.getNearestTextElement(direction); + } + if(element) { + goto = element.data('wlxmlNode').mergeContentUp(); + canvas.setCurrentElement(goto.node, {caretTo: goto.offset}); + } + event.preventDefault(); + } + }); } });