smartxml/wlxml: Merge in document node instances caching

[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 69dd060..646c68a 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/keyboard.js
+++ b/src/editor/modules/documentCanvas/canvas/keyboard.js
@@ -48,11 +48,11 @@ handlers.push({key: KEYS.ENTER,
 
         if(Object.keys(cursor.getPosition()).length === 0) {
             var currentElement = canvas.getCurrentNodeElement();
 
         if(Object.keys(cursor.getPosition()).length === 0) {
             var currentElement = canvas.getCurrentNodeElement();

-            if(currentElement) {
+            if(currentElement && !currentElement.wlxmlNode.isRoot()) {

                 canvas.wlxmlDocument.transaction(function() {
                     var added = currentElement.wlxmlNode.after({
                 canvas.wlxmlDocument.transaction(function() {
                     var added = currentElement.wlxmlNode.after({

-                        tagName: currentElement.getWlxmlTag() || 'div',
-                        attrs: {'class': currentElement.getWlxmlClass() || 'p'}
+                        tagName: currentElement.wlxmlNode.getTagName() || 'div',
+                        attrs: {'class': currentElement.wlxmlNode.getClass() || 'p'}

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


@@ -61,7 +61,7 @@ handlers.push({key: KEYS.ENTER,
                         description: gettext('Splitting text')
                     },
                     success: function(ret) {
                         description: gettext('Splitting text')
                     },
                     success: function(ret) {

-                        canvas.setCurrentElement(utils.findCanvasElement(ret), {caretTo: 'start'});
+                        canvas.setCurrentElement(utils.getElementForNode(ret), {caretTo: 'start'});

                     }
                 });
 
                     }
                 });
 


@@ -77,7 +77,7 @@ handlers.push({key: KEYS.ENTER,
 
                 canvas.wlxmlDocument.transaction(function() {
                     var added = element.wlxmlNode.after(
 
                 canvas.wlxmlDocument.transaction(function() {
                     var added = element.wlxmlNode.after(

-                        {tagName: element.getWlxmlTag() || 'div', attrs: {'class': element.getWlxmlClass() || 'p'}}
+                        {tagName: element.wlxmlNode.getTagName() || 'div', attrs: {'class': element.wlxmlNode.getClass() || 'p'}}

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


@@ -86,7 +86,7 @@ handlers.push({key: KEYS.ENTER,
                         description: gettext('Splitting text')
                     },
                     success: function(ret) {
                         description: gettext('Splitting text')
                     },
                     success: function(ret) {

-                        canvas.setCurrentElement(utils.findCanvasElement(ret), {caretTo: 'start'});
+                        canvas.setCurrentElement(utils.getElementForNode(ret), {caretTo: 'start'});

                     }
                 });
 
                     }
                 });
 


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

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

             }
         }
     }
             }
         }
     }