X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/74635b9e0dd3069953072eab9de946b77d1b313e..58fc71a8c51ee9e8df92827ed380497d2b131841:/src/editor/modules/documentCanvas/canvas/keyboard.js?ds=sidebyside

diff --git a/src/editor/modules/documentCanvas/canvas/keyboard.js b/src/editor/modules/documentCanvas/canvas/keyboard.js
index 69dd060..71a50b0 100644
--- a/src/editor/modules/documentCanvas/canvas/keyboard.js
+++ b/src/editor/modules/documentCanvas/canvas/keyboard.js
@@ -48,10 +48,10 @@ handlers.push({key: KEYS.ENTER,
 
         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({
-                        tagName: currentElement.getWlxmlTag() || 'div',
+                        tagName: currentElement.wlxmlNode.getTagName() || 'div',
                         attrs: {'class': currentElement.getWlxmlClass() || 'p'}
                     });
                     added.append({text:''});
@@ -61,7 +61,7 @@ handlers.push({key: KEYS.ENTER,
                         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(
-                        {tagName: element.getWlxmlTag() || 'div', attrs: {'class': element.getWlxmlClass() || 'p'}}
+                        {tagName: element.wlxmlNode.getTagName() || 'div', attrs: {'class': element.getWlxmlClass() || 'p'}}
                     );
                     added.append({text: ''});
                     return added;
@@ -86,7 +86,7 @@ handlers.push({key: KEYS.ENTER,
                         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'};
                 }
 
-                canvas.setCurrentElement(utils.findCanvasElement(goto), gotoOptions);
+                canvas.setCurrentElement(utils.getElementForNode(goto), gotoOptions);
             }
         }
     }