X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/3e4d8926aeff66f590b8a64f5b43cde1215d777a..967294bc545f6ae15e52f169927a89bd4a3b1122:/modules/documentCanvas/canvas/canvas.js

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index e706428..873b39e 100644
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -140,41 +140,15 @@ $.extend(Canvas.prototype, {
             
             this.d = this.wrapper.children(0);
 
-            this.wrapper.on('keydown', function(e) {
-                if(e.which === 13) { 
-                    e.preventDefault();
-                    var cursor = canvas.getCursor();
-                    if(!cursor.isSelecting()) {
-                        var position = cursor.getPosition(),
-                            element = position.element;
-
-                        if(!(element.parent().parent())) {
-                            return false; // top level element is unsplittable
-                        }
-
-                        var elements = position.element.split({offset: position.offset}),
-                            newEmpty,
-                            goto;
-
-                        if(position.offsetAtBeginning)
-                            newEmpty = elements.first;
-                        else if(position.offsetAtEnd)
-                            newEmpty = elements.second;
-                        if(newEmpty) {
-                            goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));
-                            canvas.setCurrentElement(goto);
-                        }
-                    }
-                }
-            });
-
-
             var KEYS = {
+                ENTER: 13,
                 ARROW_LEFT: 37,
                 ARROW_UP: 38,
                 ARROW_RIGHT: 39,
                 ARROW_DOWN: 40,
-                BACKSPACE: 8
+                BACKSPACE: 8,
+                DELETE: 46,
+                X: 88
             }
 
             this.wrapper.on('keyup', function(e) {
@@ -198,7 +172,8 @@ $.extend(Canvas.prototype, {
             });
          
             this.wrapper.on('keydown', function(e) {
-                var position = canvas.getCursor().getPosition(),
+                var cursor = canvas.getCursor(),
+                    position = canvas.getCursor().getPosition(),
                     element = position.element;
                 if(e.which >= 37 && e.which <= 40) {
 
@@ -229,12 +204,42 @@ $.extend(Canvas.prototype, {
 
 
                 }
-                if(e.which === KEYS.BACKSPACE) {
-                    if(element.getText().length === 1) {
+
+                var selectsWholeTextElement = function() {
+                    if(cursor.isSelecting() && cursor.getSelectionStart().offsetAtBeginning && cursor.getSelectionEnd().offsetAtEnd)
+                        return true;
+                    return false;
+                }
+
+                if(e.which === KEYS.X && e.ctrlKey && selectsWholeTextElement()) {
+                    e.preventDefault();
+                }
+
+                if(e.which === KEYS.BACKSPACE || e.which === KEYS.DELETE) {
+                    if(cursor.isSelecting() && !cursor.isSelectingWithinElement()) {
+                        e.preventDefault();
+                        return;
+                    }
+                        
+                    var cursorAtOperationEdge = position.offsetAtBeginning;
+                    if(e.which === KEYS.DELETE) {
+                        cursorAtOperationEdge = position.offsetAtEnd;
+                    }
+
+                    if(element.getText().length === 1 || selectsWholeTextElement()) {
                         e.preventDefault();
                         element.setText('');
                     }
                     else if(element.isEmpty()) {
+
+                        var direction = 'above',
+                            caretTo = 'end';
+                            
+                        if(e.which === KEYS.DELETE) {
+                            direction = 'below';
+                            caretTo = 'start';
+                        }
+
                         e.preventDefault();
 
                         var parent = element.parent(),
@@ -244,17 +249,52 @@ $.extend(Canvas.prototype, {
                             if(grandParent && grandParent.children().length === 1) {
                                 goto = grandParent.append({text: ''});
                             } else {
-                                goto = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', 'above', element.dom()[0]));
+                                goto = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0]));
                             }
                             parent.detach();
                         } else {
-                            goto = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', 'above', element.dom()[0]));
+                            goto = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0]));
                             element.detach();
                         }
-                        canvas.setCurrentElement(goto, {caretTo: 'end'});
+                        canvas.setCurrentElement(goto, {caretTo: caretTo});
                     }
-                    else if(position.offset === 0) {
+                    else if(cursorAtOperationEdge) {
                         // todo
+                        e.preventDefault();
+                    }
+                }
+
+                if(e.which === KEYS.ENTER) {
+                    e.preventDefault();
+                    var cursor = canvas.getCursor(),
+                        position = cursor.getPosition(),
+                        element = position.element;
+
+                    if(!cursor.isSelecting()) {
+                        if(e.ctrlKey) {
+                            var added = element.after({tag: 'block'});
+                            added.append({text:''});
+                            canvas.setCurrentElement(added, {caretTo: 'start'});
+
+                        } else {
+
+                            if(!(element.parent().parent())) {
+                                return false; // top level element is unsplittable
+                            }
+
+                            var elements = position.element.split({offset: position.offset}),
+                                newEmpty,
+                                goto;
+
+                            if(position.offsetAtBeginning)
+                                newEmpty = elements.first;
+                            else if(position.offsetAtEnd)
+                                newEmpty = elements.second;
+                            if(newEmpty) {
+                                goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));
+                                canvas.setCurrentElement(goto);
+                            }
+                        }
                     }
                 }
             });