X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/439024603d74ab79c0ba86d718b810b00f389210..da4ff24177c122a81ecae0e7693ffe2a3276ba1a:/src/editor/modules/documentCanvas/canvas/keyboard.js?ds=sidebyside diff --git a/src/editor/modules/documentCanvas/canvas/keyboard.js b/src/editor/modules/documentCanvas/canvas/keyboard.js index d2a8e44..71a50b0 100644 --- a/src/editor/modules/documentCanvas/canvas/keyboard.js +++ b/src/editor/modules/documentCanvas/canvas/keyboard.js @@ -4,7 +4,7 @@ define([ ], function(documentElement, utils) { 'use strict'; - +/* globals gettext */ var KEYS = { ENTER: 13, @@ -44,20 +44,27 @@ handlers.push({key: KEYS.ENTER, event.preventDefault(); var cursor = canvas.getCursor(), position = cursor.getPosition(), - element = position.element, - added; + element = position.element; 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', - attrs: {'class': currentElement.getWlxmlClass() || 'p'} + if(currentElement && !currentElement.wlxmlNode.isRoot()) { + canvas.wlxmlDocument.transaction(function() { + var added = currentElement.wlxmlNode.after({ + tagName: currentElement.wlxmlNode.getTagName() || 'div', + attrs: {'class': currentElement.getWlxmlClass() || 'p'} + }); + added.append({text:''}); + return added; + }, { + metadata: { + description: gettext('Splitting text') + }, + success: function(ret) { + canvas.setCurrentElement(utils.getElementForNode(ret), {caretTo: 'start'}); + } }); - added.append({text:''}); - canvas.wlxmlDocument.endTransaction(); - canvas.setCurrentElement(utils.findCanvasElement(added), {caretTo: 'start'}); + } return; } @@ -68,13 +75,20 @@ handlers.push({key: KEYS.ENTER, 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'}); + canvas.wlxmlDocument.transaction(function() { + var added = element.wlxmlNode.after( + {tagName: element.wlxmlNode.getTagName() || 'div', attrs: {'class': element.getWlxmlClass() || 'p'}} + ); + added.append({text: ''}); + return added; + }, { + metadata: { + description: gettext('Splitting text') + }, + success: function(ret) { + canvas.setCurrentElement(utils.getElementForNode(ret), {caretTo: 'start'}); + } + }); } else { @@ -100,18 +114,26 @@ handlers.push({key: KEYS.ENTER, // goto = nodes.second; // gotoOptions = {caretTo: 'start'}; // } + var node = position.element.wlxmlNode, + result, goto, gotoOptions; + + node.document.transaction(function() { + result = position.element.wlxmlNode.breakContent({offset: position.offset}); + }, { + metadata: { + description: gettext('Splitting text') + } + }); - 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; gotoOptions = {caretTo: 'start'}; } - canvas.setCurrentElement(utils.findCanvasElement(goto), gotoOptions); + canvas.setCurrentElement(utils.getElementForNode(goto), gotoOptions); } } } @@ -130,8 +152,10 @@ handlers.push({keys: [KEYS.ARROW_UP, KEYS.ARROW_DOWN, KEYS.ARROW_LEFT, KEYS.ARRO direction = 'below'; caretTo = 'start'; } - var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0])); - canvas.setCurrentElement(el, {caretTo: caretTo}); + var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom[0])); + if(el) { + canvas.setCurrentElement(el, {caretTo: caretTo}); + } } }, keyup: function(event, canvas) { @@ -139,18 +163,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}); } }); @@ -175,10 +205,56 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE], var cursor = canvas.getCursor(), position = canvas.getCursor().getPosition(), element = position.element, - node = element.data('wlxmlNode'); + node = element ? element.wlxmlNode : null, + direction = 'above', + caretTo = 'end', + goto; + + if(!element || !node) { + return; + } + + 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 = canvas.getNearestTextElement('above', start.element); + caretTo = 'end'; + } else { + goto = start.element; + caretTo = start.offset; + } + } else { + if(end.offsetAtEnd) { + goto = canvas.getNearestTextElement('below', start.element); + caretTo = 'start'; + } else { + goto = end.element; + caretTo = 0; + } + } + + canvas.wlxmlDocument.deleteText({ + from: { + node: start.element.wlxmlNode, + offset: start.offset + }, + to: { + node: end.element.wlxmlNode, + offset: end.offset + } + }); + if(goto) { + canvas.setCurrentElement(goto, {caretTo: caretTo}); + } return; } @@ -191,47 +267,48 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE], return element.getText().length === 1 || selectsWholeTextElement(cursor); }; - canvas.wlxmlDocument.startTransaction(); - - if(willDeleteWholeText()) { - event.preventDefault(); - node.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.wlxmlNode.append({text: ''}); + } else { + goto = canvas.getNearestTextElement(direction, element); + } + parent.wlxmlNode.detach(); } else { - goto = element.getNearestTextElement(direction); + goto = canvas.getNearestTextElement(direction, element); + element.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(); - } - canvas.wlxmlDocument.endTransaction(); - + else if(cursorAtOperationEdge) { + if(direction === 'below') { + element = canvas.getNearestTextElement(direction, element); + } + if(element) { + goto = element.wlxmlNode.mergeContentUp(); + if(goto) { + canvas.setCurrentElement(goto.node, {caretTo: goto.offset}); + } + } + event.preventDefault(); + } + }, { + metadata: { + description: gettext('Remove text') + } + }); } });