smartxml: Fixing invalidated paths used to access transformation node arguments

[fnpeditor.git] / src / editor / modules / documentCanvas / canvas / keyboard.js

diff --git a/src/editor/modules/documentCanvas/canvas/keyboard.js b/src/editor/modules/documentCanvas/canvas/keyboard.js
index 0b876f0..58036c4 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/keyboard.js
+++ b/src/editor/modules/documentCanvas/canvas/keyboard.js
@@ -52,7 +52,7 @@ handlers.push({key: KEYS.ENTER,
             if(currentElement) {
                 canvas.wlxmlDocument.startTransaction();
                 added = currentElement.data('wlxmlNode').after({
             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:''});
                     attrs: {'class': currentElement.getWlxmlClass() || 'p'}
                 });
                 added.append({text:''});


@@ -139,18 +139,24 @@ handlers.push({keys: [KEYS.ARROW_UP, KEYS.ARROW_DOWN, KEYS.ARROW_LEFT, KEYS.ARRO
             caretTo = false;
         if(!element) {
             // Chrome hack
             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 +181,53 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
         var cursor = canvas.getCursor(),
             position = canvas.getCursor().getPosition(),
             element = position.element,
         var cursor = canvas.getCursor(),
             position = canvas.getCursor().getPosition(),
             element = position.element,

-            node = element.data('wlxmlNode');
+            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();
 
         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;
         }
             
             return;
         }
             


@@ -193,25 +242,17 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
 
         canvas.wlxmlDocument.startTransaction();
         
 
         canvas.wlxmlDocument.startTransaction();
         

+
+

         if(willDeleteWholeText()) {
             event.preventDefault();
             node.setText('');
         }
         else if(element.isEmpty()) {
         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(),
             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: ''});
             if(parent.children().length === 1 && parent.children()[0].sameNode(element)) {
                 if(grandParent && grandParent.children().length === 1) {
                     goto = grandParent.data('wlxmlNode').append({text: ''});


@@ -227,7 +268,13 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
             canvas.publisher('contentChanged');
         }
         else if(cursorAtOperationEdge) {
             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();
             event.preventDefault();
         }
         canvas.wlxmlDocument.endTransaction();