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:''});
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;
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});
}
});
var cursor = canvas.getCursor(),
position = canvas.getCursor().getPosition(),
element = position.element,
- node = element.data('wlxmlNode');
+ node = element.data('wlxmlNode'),
+ goto;
if(cursor.isSelecting() && !cursor.isSelectingWithinElement()) {
event.preventDefault();
canvas.wlxmlDocument.startTransaction();
+ var direction = 'above',
+ caretTo = 'end';
+
+ if(event.which === KEYS.DELETE) {
+ direction = 'below';
+ caretTo = 'start';
+ }
+
if(willDeleteWholeText()) {
event.preventDefault();
node.setText('');
}
else if(element.isEmpty()) {
-
- var direction = 'above',
- caretTo = 'end';
-
- if(event.which === KEYS.DELETE) {
- direction = 'below';
- caretTo = 'start';
- }
-
event.preventDefault();
var parent = element.parent(),
- grandParent = parent ? parent.parent() : null,
- goto;
+ grandParent = parent ? parent.parent() : null;
if(parent.children().length === 1 && parent.children()[0].sameNode(element)) {
if(grandParent && grandParent.children().length === 1) {
goto = grandParent.data('wlxmlNode').append({text: ''});
canvas.publisher('contentChanged');
}
else if(cursorAtOperationEdge) {
- // todo
+ if(direction === 'below') {
+ element = element.getNearestTextElement(direction);
+ }
+ if(element) {
+ goto = element.data('wlxmlNode').mergeContentUp();
+ canvas.setCurrentElement(goto.node, {caretTo: goto.offset});
+ }
event.preventDefault();
}
canvas.wlxmlDocument.endTransaction();