X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/cd106525cca6355309617b7a7092bd58cb9d8ce8..b4f3f9be95d6b0a454e18389bb0903e0cd63ae53:/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 58036c4..378adee 100644
--- a/src/editor/modules/documentCanvas/canvas/keyboard.js
+++ b/src/editor/modules/documentCanvas/canvas/keyboard.js
@@ -131,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) {
@@ -240,45 +242,43 @@ 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()) {
-            event.preventDefault();
-
-            var parent = element.parent(),
-                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.wlxmlDocument.transaction(function() {
+            if(willDeleteWholeText()) {
+                event.preventDefault();
+                node.setText('');
+            }
+            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.publisher('contentChanged');
-        }
-        else if(cursorAtOperationEdge) {
-            if(direction === 'below') {
-                element = element.getNearestTextElement(direction);
+                canvas.setCurrentElement(goto, {caretTo: caretTo});
+                canvas.publisher('contentChanged');
             }
-            if(element) {
-                goto = element.data('wlxmlNode').mergeContentUp();
-                canvas.setCurrentElement(goto.node, {caretTo: goto.offset});
+            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();
             }
-            event.preventDefault();
-        }
-        canvas.wlxmlDocument.endTransaction();
-
+        });
     }
 });