editor: metadata wip fix

[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 57a245e..cd12a02 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,23 +44,37 @@ 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.after({tag: currentElement.getWlxmlTag() || 'div', klass: currentElement.getWlxmlClass() || 'p'});
+                canvas.wlxmlDocument.startTransaction();
+                added = currentElement.data('wlxmlNode').after({
+                    tagName: currentElement.getWlxmlTag() || 'div',
+                    attrs: {'class': currentElement.getWlxmlClass() || 'p'}
+                });

                 added.append({text:''});
                 added.append({text:''});

-                canvas.setCurrentElement(added, {caretTo: 'start'});
+                canvas.wlxmlDocument.endTransaction();
+                canvas.setCurrentElement(utils.findCanvasElement(added), {caretTo: 'start'});

             }
             return;
         }
 
         if(!cursor.isSelecting()) {
             if(event.ctrlKey) {
             }
             return;
         }
 
         if(!cursor.isSelecting()) {
             if(event.ctrlKey) {

-                var added = element.after({tag: element.getWlxmlTag() || 'div', klass: element.getWlxmlClass() || 'p'});
-                added.append({text:''});
-                canvas.setCurrentElement(added, {caretTo: 'start'});
+                if(element instanceof documentElement.DocumentTextElement) {
+                    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'});

 
             } else {
 
 
             } else {
 


@@ -66,25 +82,36 @@ handlers.push({key: KEYS.ENTER,
                     return false; // top level element is unsplittable
                 }
 
                     return false; // top level element is unsplittable
                 }
 

-                var elements = position.element.split({offset: position.offset}),
-                    newEmpty,
-                    goto,
-                    gotoOptions;
+                //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 = elements.first;
-                else if(position.offsetAtEnd)
-                    newEmpty = elements.second;
+                // if(position.offsetAtBeginning)
+                //     newEmpty = nodes.first;
+                // else if(position.offsetAtEnd)
+                //     newEmpty = nodes.second;

                 
                 

-                if(newEmpty) {
-                    goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));
+                // 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 {
                     gotoOptions = {};
                 } else {

-                    goto = elements.second;
+                    goto = result.second;

                     gotoOptions = {caretTo: 'start'};
                 }
 
                     gotoOptions = {caretTo: 'start'};
                 }
 

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

             }
         }
     }
             }
         }
     }


@@ -112,31 +139,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();

+        }

     }
 });
 
     }
 });
 


@@ -144,7 +180,8 @@ 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');

 
         if(cursor.isSelecting() && !cursor.isSelectingWithinElement()) {
             event.preventDefault();
 
         if(cursor.isSelecting() && !cursor.isSelectingWithinElement()) {
             event.preventDefault();


@@ -158,11 +195,13 @@ 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);

-        }
+        };

 
 

+        canvas.wlxmlDocument.startTransaction();
+        

         if(willDeleteWholeText()) {
             event.preventDefault();
         if(willDeleteWholeText()) {
             event.preventDefault();

-            element.setText('');
+            node.setText('');

         }
         else if(element.isEmpty()) {
 
         }
         else if(element.isEmpty()) {
 


@@ -181,14 +220,14 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
                 goto;
             if(parent.children().length === 1 && parent.children()[0].sameNode(element)) {
                 if(grandParent && grandParent.children().length === 1) {
                 goto;
             if(parent.children().length === 1 && parent.children()[0].sameNode(element)) {
                 if(grandParent && grandParent.children().length === 1) {

-                    goto = grandParent.append({text: ''});
+                    goto = grandParent.data('wlxmlNode').append({text: ''});

                 } else {
                     goto = element.getNearestTextElement(direction);
                 }
                 } else {
                     goto = element.getNearestTextElement(direction);
                 }

-                parent.detach();
+                parent.data('wlxmlNode').detach();

             } else {
                 goto = element.getNearestTextElement(direction);
             } else {
                 goto = element.getNearestTextElement(direction);

-                element.detach();
+                element.data('wlxmlNode').detach();

             }
             canvas.setCurrentElement(goto, {caretTo: caretTo});
             canvas.publisher('contentChanged');
             }
             canvas.setCurrentElement(goto, {caretTo: caretTo});
             canvas.publisher('contentChanged');


@@ -197,6 +236,8 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
             // todo
             event.preventDefault();
         }
             // todo
             event.preventDefault();
         }

+        canvas.wlxmlDocument.endTransaction();
+

     }
 });
 
     }
 });