wlxml: extending isInside/getParent/is to support tag name

[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 6b55909..383ca18 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/keyboard.js
+++ b/src/editor/modules/documentCanvas/canvas/keyboard.js
@@ -51,7 +51,7 @@ handlers.push({key: KEYS.ENTER,
             var currentElement = canvas.getCurrentNodeElement();
             if(currentElement) {
                 canvas.wlxmlDocument.startTransaction();
             var currentElement = canvas.getCurrentNodeElement();
             if(currentElement) {
                 canvas.wlxmlDocument.startTransaction();

-                added = currentElement.data('wlxmlNode').after({
+                added = currentElement.wlxmlNode.after({

                     tagName: currentElement.getWlxmlTag() || 'div',
                     attrs: {'class': currentElement.getWlxmlClass() || 'p'}
                 });
                     tagName: currentElement.getWlxmlTag() || 'div',
                     attrs: {'class': currentElement.getWlxmlClass() || 'p'}
                 });


@@ -69,7 +69,7 @@ handlers.push({key: KEYS.ENTER,
                 }
 
                 canvas.wlxmlDocument.startTransaction();
                 }
 
                 canvas.wlxmlDocument.startTransaction();

-                added = element.data('wlxmlNode').after(
+                added = element.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: ''});


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

-                var result = position.element.data('wlxmlNode').breakContent({offset: position.offset}),
+                var result = position.element.wlxmlNode.breakContent({offset: position.offset}),

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


@@ -131,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) {


@@ -181,11 +183,14 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
         var cursor = canvas.getCursor(),
             position = canvas.getCursor().getPosition(),
             element = position.element,
         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;
 
             direction = 'above',
             caretTo = 'end',
             goto;
 

+        if(!element || !node) {
+            return;
+        }

             
         if(event.which === KEYS.DELETE) {
             direction = 'below';
             
         if(event.which === KEYS.DELETE) {
             direction = 'below';


@@ -217,11 +222,11 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
 
             canvas.wlxmlDocument.deleteText({
                 from: {
 
             canvas.wlxmlDocument.deleteText({
                 from: {

-                    node: start.element.data('wlxmlNode'),
+                    node: start.element.wlxmlNode,

                     offset: start.offset
                 },
                 to: {
                     offset: start.offset
                 },
                 to: {

-                    node: end.element.data('wlxmlNode'),
+                    node: end.element.wlxmlNode,

                     offset: end.offset
                 }
             });
                     offset: end.offset
                 }
             });


@@ -249,26 +254,28 @@ handlers.push({keys: [KEYS.BACKSPACE, KEYS.DELETE],
                 event.preventDefault();
                 var parent = element.parent(),
                     grandParent = parent ? parent.parent() : null;
                 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) {
                 if(parent.children().length === 1 && parent.children()[0].sameNode(element)) {
                     if(grandParent && grandParent.children().length === 1) {

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

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

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

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

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

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

-                canvas.publisher('contentChanged');

             }
             else if(cursorAtOperationEdge) {
                 if(direction === 'below') {
                     element = element.getNearestTextElement(direction);
                 }
                 if(element) {
             }
             else if(cursorAtOperationEdge) {
                 if(direction === 'below') {
                     element = element.getNearestTextElement(direction);
                 }
                 if(element) {

-                    goto = element.data('wlxmlNode').mergeContentUp();
+                    goto = element.wlxmlNode.mergeContentUp();

                     canvas.setCurrentElement(goto.node, {caretTo: goto.offset});
                 }
                 event.preventDefault();
                     canvas.setCurrentElement(goto.node, {caretTo: goto.offset});
                 }
                 event.preventDefault();