From: Aleksander Ɓukasz Date: Wed, 14 Aug 2013 11:31:10 +0000 (+0200) Subject: canvas api: Unwraping the whole content of a DocumentTextElement X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/7deea014cb2487a808a54c37646b74f5d255f575?hp=5b89eff5afcb92f0e7b20daf62eae30aeb7b4e1c canvas api: Unwraping the whole content of a DocumentTextElement --- diff --git a/modules/documentCanvas/canvas/canvas.test3.js b/modules/documentCanvas/canvas/canvas.test3.js index f96e0ff..1908574 100644 --- a/modules/documentCanvas/canvas/canvas.test3.js +++ b/modules/documentCanvas/canvas/canvas.test3.js @@ -810,6 +810,44 @@ describe('Canvas', function() { expect(sectionChildren[0].getText()).to.equal('Sometext'); }); }); + + describe('unwrapping the whole content of a DocumentNodeElement', function() { + it('removes a DocumentNodeElement but keeps its content', function() { + var c = canvas.fromXML('
Alice hasa cat
'), + section = c.doc(), + div = c.doc().children()[0], + span = div.children()[1]; + + var range = div.unwrapContents(), + sectionChildren = section.children(); + + expect(sectionChildren).to.have.length(3); + expect(sectionChildren[0].getText()).to.equal('Alice has'); + expect(sectionChildren[1].sameNode(span)).to.equal(true, 'span ok'); + expect(sectionChildren[2].getText()).to.equal(' cat'); + + expect(range.element1.sameNode(sectionChildren[0])).to.equal(true, 'range start ok'); + expect(range.element2.sameNode(sectionChildren[2])).to.equal(true, 'range end ok'); + }); + it('merges text elements on the boundries', function() { + var c = canvas.fromXML('
Alice
has a cat!
!!
'), + section = c.doc(), + div = c.doc().children()[1], + span = div.children()[1]; + + var range = div.unwrapContents(), + sectionChildren = section.children(); + + expect(sectionChildren).to.have.length(3); + expect(sectionChildren[0].getText()).to.equal('Alicehas a '); + expect(sectionChildren[1].sameNode(span)).to.equal(true, 'span ok'); + expect(sectionChildren[2].getText()).to.equal('!!!'); + + expect(range.element1.sameNode(sectionChildren[0])).to.equal(true, 'range start ok'); + expect(range.element2.sameNode(sectionChildren[2])).to.equal(true, 'range end ok'); + }); + }); + }); describe('Lists api', function() { diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js index b7e8352..7ca7e59 100644 --- a/modules/documentCanvas/canvas/documentElement.js +++ b/modules/documentCanvas/canvas/documentElement.js @@ -216,6 +216,44 @@ $.extend(DocumentNodeElement.prototype, { this.canvas = null; return this; }, + unwrapContents: function() { + var parent = this.parent(); + if(!parent) + return; + + var parentChildren = parent.children(), + myChildren = this.children(), + myIdx = parent.childIndex(this); + + if(myChildren.length === 0) + return this.detach(); + + var moveLeftRange, moveRightRange; + + if(myIdx > 0 && (parentChildren[myIdx-1] instanceof DocumentTextElement) && (myChildren[0] instanceof DocumentTextElement)) { + parentChildren[myIdx-1].appendText(myChildren[0].getText()); + myChildren[0].detach(); + moveLeftRange = true; + } + + if(myIdx < parentChildren.length - 1 && (parentChildren[parentChildren.length-1] instanceof DocumentTextElement) && (myChildren[myChildren.length-1] instanceof DocumentTextElement)) { + parentChildren[parentChildren.length-1].prependText(myChildren[myChildren.length-1].getText()); + myChildren[myChildren.length-1].detach(); + moveRightRange = true; + } + + var childrenLength = this.children().length; + this.children().forEach(function(child) { + this.before(child); + }.bind(this)); + + this.detach(); + + return { + element1: parent.children()[myIdx + (moveLeftRange ? -1 : 0)], + element2: parent.children()[myIdx + childrenLength-1 + (moveRightRange ? 1 : 0)] + }; + }, data: function() { var dom = this.dom(), args = Array.prototype.slice.call(arguments, 0); @@ -477,6 +515,9 @@ $.extend(DocumentTextElement.prototype, { appendText: function(text) { this.dom().contents()[0].data += text; }, + prependText: function(text) { + this.dom().contents()[0].data = text + this.dom().contents()[0].data; + }, getText: function() { return this.dom().text().replace(utils.unicode.ZWS, ''); },