fnp / fnpeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
wlxml: small fix in list extension
[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 e48917c..378adee 100644 (file)
--- 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) {
 };
 
 var handles = function(handler, event) {
-    if(handler.key === event.which)
+    if(handler.key === event.which) {
         return true;
         return true;
-    if(handler.keys && handler.keys.indexOf(event.which) !== -1)
+    }
+    if(handler.keys && handler.keys.indexOf(event.which) !== -1) {
         return true;
         return true;
+    }
     return false;
 };
 
     return false;
 };
 
@@ -42,16 +44,19 @@ 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;
+            element = position.element,
+            added;
 
         if(Object.keys(cursor.getPosition()).length === 0) {
             var currentElement = canvas.getCurrentNodeElement();
             if(currentElement) {
 
         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:''});
                     attrs: {'class': currentElement.getWlxmlClass() || 'p'}
                 });
                 added.append({text:''});
+                canvas.wlxmlDocument.endTransaction();
                 canvas.setCurrentElement(utils.findCanvasElement(added), {caretTo: 'start'});
             }
             return;
                 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();
                 }
                 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: ''});
                     {tagName: element.getWlxmlTag() || 'div', attrs: {'class': element.getWlxmlClass() || 'p'}}
                 );
                 added.append({text: ''});
+                canvas.wlxmlDocument.endTransaction();
                 canvas.setCurrentElement(utils.findCanvasElement(added), {caretTo: 'start'});
 
             } else {
                 canvas.setCurrentElement(utils.findCanvasElement(added), {caretTo: 'start'});
 
             } else {
@@ -96,11 +104,11 @@ handlers.push({key: KEYS.ENTER,
                 var result = position.element.data('wlxmlNode').breakContent({offset: position.offset}),
                     goto, gotoOptions;
                 if(result.emptyText) {
                 var result = position.element.data('wlxmlNode').breakContent({offset: position.offset}),
                     goto, gotoOptions;
                 if(result.emptyText) {
-                    goto = result.createdEmpty;
+                    goto = result.emptyText;
                     gotoOptions = {};
                 } else {
                     goto = result.second;
                     gotoOptions = {};
                 } else {
                     goto = result.second;
-                    gotoOptions = {caretTo: 'start'};   
+                    gotoOptions = {caretTo: 'start'};
                 }
 
                 canvas.setCurrentElement(utils.findCanvasElement(goto), gotoOptions);
                 }
 
                 canvas.setCurrentElement(utils.findCanvasElement(goto), gotoOptions);
@@ -123,7 +131,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]));
                 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) {
         }
     },
     keyup: function(event, canvas) {
@@ -131,31 +141,40 @@ 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();
             }
             }
-            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) {
     }
 });
 
 
 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 true;
+    }
     return false;
     return false;
-}
+};
 
 handlers.push({key: KEYS.X,
     keydown: function(event, canvas) {
 
 handlers.push({key: KEYS.X,
     keydown: function(event, canvas) {
-        if(event.ctrlKey && selectsWholeTextElement(canvas.getCursor()))
+        if(event.ctrlKey && selectsWholeTextElement(canvas.getCursor())) {
             event.preventDefault();
             event.preventDefault();
+        }
     }
 });
 
     }
 });
 
@@ -163,10 +182,54 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
     keydown: function(event, canvas) {
         var cursor = canvas.getCursor(),
             position = canvas.getCursor().getPosition(),
     keydown: function(event, canvas) {
         var cursor = canvas.getCursor(),
             position = canvas.getCursor().getPosition(),
-            element = position.element;
+            element = position.element,
+            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;
         }
             
@@ -177,45 +240,45 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
 
         var willDeleteWholeText = function() {
             return element.getText().length === 1 || selectsWholeTextElement(cursor);
 
         var willDeleteWholeText = function() {
             return element.getText().length === 1 || selectsWholeTextElement(cursor);
-        }
+        };
 
 
-        if(willDeleteWholeText()) {
-            event.preventDefault();
-            element.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.data('wlxmlNode').append({text: ''});
+                    } else {
+                        goto = element.getNearestTextElement(direction);
+                    }
+                    parent.data('wlxmlNode').detach();
                 } else {
                     goto = element.getNearestTextElement(direction);
                 } else {
                     goto = element.getNearestTextElement(direction);
+                    element.data('wlxmlNode').detach();
                 }
                 }
-                parent.data('wlxmlNode').detach();
-            } else {
-                goto = element.getNearestTextElement(direction);
-                element.data('wlxmlNode').detach();
+                canvas.setCurrentElement(goto, {caretTo: caretTo});
+                canvas.publisher('contentChanged');
             }
             }
-            canvas.setCurrentElement(goto, {caretTo: caretTo});
-            canvas.publisher('contentChanged');
-        }
-        else if(cursorAtOperationEdge) {
-            // todo
-            event.preventDefault();
-        }
+            else if(cursorAtOperationEdge) {
+                if(direction === 'below') {
+                    element = element.getNearestTextElement(direction);
+                }
+                if(element) {
+                    goto = element.data('wlxmlNode').mergeContentUp();
+                    canvas.setCurrentElement(goto.node, {caretTo: goto.offset});
+                }
+                event.preventDefault();
+            }
+        });
     }
 });
 
     }
 });