X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/6757e2f4fe80bfdc197d4963c464bf2b3a47f66b..aa2d1772f5df4aa0e43d993b0db857504901e491:/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 dfe3f66..cd12a02 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 {
@@ -75,21 +83,31 @@ handlers.push({key: KEYS.ENTER,
                 }
 
                 //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;
+                // 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(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'};
                 }
 
@@ -121,31 +139,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();
+        }
     }
 });
 
@@ -153,7 +180,8 @@ 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');
 
         if(cursor.isSelecting() && !cursor.isSelectingWithinElement()) {
             event.preventDefault();
@@ -167,11 +195,13 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
 
         var willDeleteWholeText = function() {
             return element.getText().length === 1 || selectsWholeTextElement(cursor);
-        }
+        };
 
+        canvas.wlxmlDocument.startTransaction();
+        
         if(willDeleteWholeText()) {
             event.preventDefault();
-            element.setText('');
+            node.setText('');
         }
         else if(element.isEmpty()) {
 
@@ -206,6 +236,8 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
             // todo
             event.preventDefault();
         }
+        canvas.wlxmlDocument.endTransaction();
+
     }
 });