From 25e14ce74de1ecdd95f36cb19e231b5a66898038 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Wed, 7 Aug 2013 12:06:38 +0200
Subject: [PATCH] Fix: Detaching node element surrounded by text elements now
 merges these text elements together

---
 modules/documentCanvas/canvas/canvas.test3.js | 16 ++++++++++
 .../documentCanvas/canvas/documentElement.js  | 32 +++++++++++++++----
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/modules/documentCanvas/canvas/canvas.test3.js b/modules/documentCanvas/canvas/canvas.test3.js
index 10f8348..0fe89cc 100644
--- a/modules/documentCanvas/canvas/canvas.test3.js
+++ b/modules/documentCanvas/canvas/canvas.test3.js
@@ -458,6 +458,22 @@ describe('Canvas', function() {
                 });
             });
 
+            describe('Removing elements', function() {
+                it('merges left and right DocumentTextElement sibling of a detached DocumentNodeElement', function() {
+                    var c = canvas.fromXML('<section>Alice<div>has</div>a cat</section>'),
+                        section = c.doc(),
+                        div = section.children()[1];
+
+                    div.detach();
+
+                    var sectionChildren = section.children(),
+                        textElement = sectionChildren[0];
+
+                    expect(sectionChildren).to.have.length(1);
+                    expect(textElement.getText()).to.equal('Alicea cat');
+                });
+            });
+
             describe('Splitting text', function() {
                 
                 it('splits DocumentTextElement\'s parent into two DocumentNodeElements of the same type', function() {
diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 689df0e..4a236df 100644
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -80,12 +80,6 @@ $.extend(DocumentElement.prototype, {
         return wrapper;
     },
 
-    detach: function() {
-        this.dom().detach();
-        this.canvas = null;
-        return this;
-    },
-
     markAsCurrent: function() {
         this.canvas.markAsCurrent(this);
     },
@@ -178,6 +172,24 @@ $.extend(DocumentNodeElement.prototype, {
     _container: function() {
         return this.dom().children('[document-element-content]');
     },
+    detach: function() {
+        var parent = this.parent();
+        if(!parent)
+            return;
+
+        var parentChildren = parent.children(),
+            myIdx = parent.childIndex(this);
+
+        if(myIdx > 0 && myIdx < parentChildren.length) {
+            if((parentChildren[myIdx-1] instanceof DocumentTextElement) && (parentChildren[myIdx+1] instanceof DocumentTextElement)) {
+                parentChildren[myIdx-1].appendText(parentChildren[myIdx+1].getText());
+                parentChildren[myIdx+1].detach();
+            }
+        }
+        this.dom().detach();
+        this.canvas = null;
+        return this;
+    },
     data: function() {
         var dom = this.dom(),
             args = Array.prototype.slice.call(arguments, 0);
@@ -417,9 +429,17 @@ $.extend(DocumentTextElement.prototype, {
         else
             this.$element = $element;
     },
+    detach: function() {
+        this.dom().detach();
+        this.canvas = null;
+        return this;
+    },
     setText: function(text) {
         this.dom().contents()[0].data = text;
     },
+    appendText: function(text) {
+        this.dom().contents()[0].data += text;
+    },
     getText: function() {
         return this.dom().text().replace(utils.unicode.ZWS, '');
     },
-- 
2.20.1