fnpjs: Action now triggers actionExecuted event instead of using callback

[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 9be3dae..71a50b0 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/keyboard.js
+++ b/src/editor/modules/documentCanvas/canvas/keyboard.js
@@ -44,20 +44,27 @@ handlers.push({key: KEYS.ENTER,
         event.preventDefault();
         var cursor = canvas.getCursor(),
             position = cursor.getPosition(),
         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(Object.keys(cursor.getPosition()).length === 0) {
             var currentElement = canvas.getCurrentNodeElement();

-            if(currentElement) {
-                canvas.wlxmlDocument.startTransaction(gettext('Splitting text'));
-                added = currentElement.wlxmlNode.after({
-                    tagName: 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;
         }
             }
             return;
         }


@@ -68,13 +75,20 @@ handlers.push({key: KEYS.ENTER,
                     element = element.parent();
                 }
 
                     element = element.parent();
                 }
 

-                canvas.wlxmlDocument.startTransaction(gettext('Splitting text'));
-                added = element.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 {
 
 
             } else {
 


@@ -105,7 +119,11 @@ handlers.push({key: KEYS.ENTER,
 
                 node.document.transaction(function() {
                     result = position.element.wlxmlNode.breakContent({offset: position.offset});
 
                 node.document.transaction(function() {
                     result = position.element.wlxmlNode.breakContent({offset: position.offset});

-                }, this, gettext('Splitting text'));
+                }, {
+                    metadata: {
+                        description: gettext('Splitting text')
+                    }
+                });

 
                 if(result.emptyText) {
                     goto = result.emptyText;
 
                 if(result.emptyText) {
                     goto = result.emptyText;


@@ -115,7 +133,7 @@ handlers.push({key: KEYS.ENTER,
                     gotoOptions = {caretTo: 'start'};
                 }
 
                     gotoOptions = {caretTo: 'start'};
                 }
 

-                canvas.setCurrentElement(utils.findCanvasElement(goto), gotoOptions);
+                canvas.setCurrentElement(utils.getElementForNode(goto), gotoOptions);

             }
         }
     }
             }
         }
     }


@@ -134,7 +152,7 @@ handlers.push({keys: [KEYS.ARROW_UP, KEYS.ARROW_DOWN, KEYS.ARROW_LEFT, KEYS.ARRO
                 direction = 'below';
                 caretTo = 'start';
             }
                 direction = 'below';
                 caretTo = 'start';
             }

-            var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0]));
+            var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom[0]));

             if(el) {
                 canvas.setCurrentElement(el, {caretTo: caretTo});
             }
             if(el) {
                 canvas.setCurrentElement(el, {caretTo: caretTo});
             }


@@ -208,7 +226,7 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
 
             if(direction === 'above') {
                 if(start.offsetAtBeginning) {
 
             if(direction === 'above') {
                 if(start.offsetAtBeginning) {

-                    goto = start.element.getNearestTextElement('above');
+                    goto = canvas.getNearestTextElement('above', start.element);

                     caretTo = 'end';
                 } else {
                     goto = start.element;
                     caretTo = 'end';
                 } else {
                     goto = start.element;


@@ -216,7 +234,7 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
                 }
             } else {
                 if(end.offsetAtEnd) {
                 }
             } else {
                 if(end.offsetAtEnd) {

-                    goto = start.element.getNearestTextElement('below');
+                    goto = canvas.getNearestTextElement('below', start.element);

                     caretTo = 'start';
                 } else {
                     goto = end.element;
                     caretTo = 'start';
                 } else {
                     goto = end.element;


@@ -265,25 +283,31 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
                     if(grandParent && grandParent.children().length === 1) {
                         goto = grandParent.wlxmlNode.append({text: ''});
                     } else {
                     if(grandParent && grandParent.children().length === 1) {
                         goto = grandParent.wlxmlNode.append({text: ''});
                     } else {

-                        goto = element.getNearestTextElement(direction);
+                        goto = canvas.getNearestTextElement(direction, element);

                     }
                     parent.wlxmlNode.detach();
                 } else {
                     }
                     parent.wlxmlNode.detach();
                 } else {

-                    goto = element.getNearestTextElement(direction);
+                    goto = canvas.getNearestTextElement(direction, element);

                     element.wlxmlNode.detach();
                 }
                 canvas.setCurrentElement(goto, {caretTo: caretTo});
             }
             else if(cursorAtOperationEdge) {
                 if(direction === 'below') {
                     element.wlxmlNode.detach();
                 }
                 canvas.setCurrentElement(goto, {caretTo: caretTo});
             }
             else if(cursorAtOperationEdge) {
                 if(direction === 'below') {

-                    element = element.getNearestTextElement(direction);
+                    element = canvas.getNearestTextElement(direction, element);

                 }
                 if(element) {
                     goto = element.wlxmlNode.mergeContentUp();
                 }
                 if(element) {
                     goto = element.wlxmlNode.mergeContentUp();

-                    canvas.setCurrentElement(goto.node, {caretTo: goto.offset});
+                    if(goto) {
+                        canvas.setCurrentElement(goto.node, {caretTo: goto.offset});
+                    }

                 }
                 event.preventDefault();
             }
                 }
                 event.preventDefault();
             }

+        }, {
+            metadata: {
+                description: gettext('Remove text')
+            }

         });
     }
 });
         });
     }
 });