smartxml: minor refactoring - better naming

[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 603249e..4cf3d77 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/keyboard.js
+++ b/src/editor/modules/documentCanvas/canvas/keyboard.js
@@ -4,7 +4,7 @@ define([
 ], function(documentElement, utils) {
     
 'use strict';
-
+/* globals gettext */
 
 var KEYS = {
     ENTER: 13,
@@ -44,20 +44,27 @@ handlers.push({key: KEYS.ENTER,
         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(currentElement) {
-                canvas.wlxmlDocument.startTransaction();
-                added = currentElement.data('wlxmlNode').after({
-                    tag: currentElement.getWlxmlTag() || 'div',
-                    attrs: {'class': currentElement.getWlxmlClass() || 'p'}
+                canvas.wlxmlDocument.transaction(function() {
+                    var added = currentElement.wlxmlNode.after({
+                        tagName: currentElement.getWlxmlTag() || 'div',
+                        attrs: {'class': currentElement.getWlxmlClass() || 'p'}
+                    });
+                    added.append({text:''});
+                    return added;
+                }, {
+                    metadata: {
+                        description: gettext('Splitting text')
+                    },
+                    success: function(ret) {
+                        canvas.setCurrentElement(utils.findCanvasElement(ret), {caretTo: 'start'});
+                    }
                 });
-                added.append({text:''});
-                canvas.wlxmlDocument.endTransaction();
-                canvas.setCurrentElement(utils.findCanvasElement(added), {caretTo: 'start'});
+
             }
             return;
         }
@@ -68,13 +75,20 @@ handlers.push({key: KEYS.ENTER,
                     element = element.parent();
                 }
 
-                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'});
+                canvas.wlxmlDocument.transaction(function() {
+                    var added = element.wlxmlNode.after(
+                        {tagName: element.getWlxmlTag() || 'div', attrs: {'class': element.getWlxmlClass() || 'p'}}
+                    );
+                    added.append({text: ''});
+                    return added;
+                }, {
+                    metadata: {
+                        description: gettext('Splitting text')
+                    },
+                    success: function(ret) {
+                        canvas.setCurrentElement(utils.findCanvasElement(ret), {caretTo: 'start'});
+                    }
+                });
 
             } else {
 
@@ -100,9 +114,17 @@ handlers.push({key: KEYS.ENTER,
                 //     goto = nodes.second;
                 //     gotoOptions = {caretTo: 'start'};
                 // }
+                var node = position.element.wlxmlNode,
+                    result, goto, gotoOptions;
+
+                node.document.transaction(function() {
+                    result = position.element.wlxmlNode.breakContent({offset: position.offset});
+                }, {
+                    metadata: {
+                        description: gettext('Splitting text')
+                    }
+                });
 
-                var result = position.element.data('wlxmlNode').breakContent({offset: position.offset}),
-                    goto, gotoOptions;
                 if(result.emptyText) {
                     goto = result.emptyText;
                     gotoOptions = {};
@@ -131,7 +153,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) {
@@ -181,10 +205,56 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
         var cursor = canvas.getCursor(),
             position = canvas.getCursor().getPosition(),
             element = position.element,
-            node = element.data('wlxmlNode');
+            node = element ? element.wlxmlNode : null,
+            direction = 'above',
+            caretTo = 'end',
+            goto;
+
+        if(!element || !node) {
+            return;
+        }
+            
+        if(event.which === KEYS.DELETE) {
+            direction = 'below';
+            caretTo = 'start';
+        }
 
         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.wlxmlNode,
+                    offset: start.offset
+                },
+                to: {
+                    node: end.element.wlxmlNode,
+                    offset: end.offset
+                }
+            });
+            if(goto) {
+                canvas.setCurrentElement(goto, {caretTo: caretTo});
+            }
             return;
         }
             
@@ -197,47 +267,48 @@ 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()) {
-
-            var direction = 'above',
-                caretTo = 'end';
-                
-            if(event.which === KEYS.DELETE) {
-                direction = 'below';
-                caretTo = 'start';
+        canvas.wlxmlDocument.transaction(function() {
+            if(willDeleteWholeText()) {
+                event.preventDefault();
+                node.setText('');
             }
-
-            event.preventDefault();
-
-            var parent = element.parent(),
-                grandParent = parent ? parent.parent() : null,
-                goto;
-            if(parent.children().length === 1 && parent.children()[0].sameNode(element)) {
-                if(grandParent && grandParent.children().length === 1) {
-                    goto = grandParent.data('wlxmlNode').append({text: ''});
+            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.wlxmlNode.append({text: ''});
+                    } else {
+                        goto = element.getNearestTextElement(direction);
+                    }
+                    parent.wlxmlNode.detach();
                 } else {
                     goto = element.getNearestTextElement(direction);
+                    element.wlxmlNode.detach();
                 }
-                parent.data('wlxmlNode').detach();
-            } else {
-                goto = element.getNearestTextElement(direction);
-                element.data('wlxmlNode').detach();
+                canvas.setCurrentElement(goto, {caretTo: caretTo});
             }
-            canvas.setCurrentElement(goto, {caretTo: caretTo});
-            canvas.publisher('contentChanged');
-        }
-        else if(cursorAtOperationEdge) {
-            // todo
-            event.preventDefault();
-        }
-        canvas.wlxmlDocument.endTransaction();
-
+            else if(cursorAtOperationEdge) {
+                if(direction === 'below') {
+                    element = element.getNearestTextElement(direction);
+                }
+                if(element) {
+                    goto = element.wlxmlNode.mergeContentUp();
+                    if(goto) {
+                        canvas.setCurrentElement(goto.node, {caretTo: goto.offset});
+                    }
+                }
+                event.preventDefault();
+            }
+        }, {
+            metadata: {
+                description: gettext('Remove text')
+            }
+        });
     }
 });