editor: canvas - enter on an empty last list item creates paragraph after list

[fnpeditor.git] / src / smartxml / core.js

diff --git a/src/smartxml/core.js b/src/smartxml/core.js
index b40e9c3..6329491 100644 (file)
--- a/src/smartxml/core.js
+++ b/src/smartxml/core.js
@@ -121,10 +121,13 @@ var documentNodeTransformations = {
 var elementNodeTransformations = {
 
     detach: function(params) {
 var elementNodeTransformations = {
 
     detach: function(params) {

-        var next;
-        params = _.extend({
-            normalizeStrategy: 'merge'
-        }, params);
+        var next, prev;
+
+        params = params || {};
+
+        if(!params.normalizeStrategy) {
+            params.normalizeStrategy = 'merge';
+        }

 
         if(this.parent() && this.isSurroundedByTextNodes()) {
             if(params.normalizeStrategy === 'detach-left') {
 
         if(this.parent() && this.isSurroundedByTextNodes()) {
             if(params.normalizeStrategy === 'detach-left') {


@@ -133,7 +136,12 @@ var elementNodeTransformations = {
                 this.next().detach();
             } else if(params.normalizeStrategy === 'merge') {
                 next = this.next();
                 this.next().detach();
             } else if(params.normalizeStrategy === 'merge') {
                 next = this.next();

-                this.prev().appendText(next.getText());
+                prev = this.prev();
+                params.ret = {
+                    mergedTo: prev,
+                    previousLen: prev.getText().length
+                };
+                prev.appendText(next.getText());

                 next.detach();
             } else {
                 throw new Error('unknown normalize strategy for detach');
                 next.detach();
             } else {
                 throw new Error('unknown normalize strategy for detach');


@@ -474,7 +482,7 @@ var documentTransformations = {
         return insertion.ofNode;
     },
     deleteText: function(params) {
         return insertion.ofNode;
     },
     deleteText: function(params) {

-        var ptr, next, toDetach, middle, text;
+        var ptr, next, nextNext, toDetach, middle, text;

 
         if(params.from.node.sameNode(params.to.node)) {
             ptr = params.from.node;
 
         if(params.from.node.sameNode(params.to.node)) {
             ptr = params.from.node;


@@ -502,7 +510,11 @@ var documentTransformations = {
                 } else {
                     toDetach = next;
                     next = next.next();
                 } else {
                     toDetach = next;
                     next = next.next();

-                    toDetach.detach();
+                    nextNext = next ? next.next() : null;
+                    toDetach.detach({normalizeStrategy: (next && next.sameNode(params.to.node)) ? 'merge' : 'detach-right'});
+                    if(next && !next.isInDocument()) {
+                        next = nextNext;
+                    }

                 }
             } else {
                 ptr = ptr.parent();
                 }
             } else {
                 ptr = ptr.parent();