From 0054f55492949c1b2b473a80d7fc170931b0a857 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Mon, 8 Jul 2013 22:36:27 +0200 Subject: [PATCH 1/1] Splitting text --- modules/documentCanvas/canvas/canvas.test3.js | 53 +++++++++++++++++++ .../documentCanvas/canvas/documentElement.js | 37 ++++++++++++- 2 files changed, 88 insertions(+), 2 deletions(-) diff --git a/modules/documentCanvas/canvas/canvas.test3.js b/modules/documentCanvas/canvas/canvas.test3.js index 0ffa9d9..95f9f60 100644 --- a/modules/documentCanvas/canvas/canvas.test3.js +++ b/modules/documentCanvas/canvas/canvas.test3.js @@ -210,6 +210,59 @@ describe('Canvas', function() { }); }); + describe('Splitting text', function() { + + it('splits DocumentTextElement\'s parent into two DocumentNodeElements of the same type', function() { + var c = canvas.fromXML('
Some header
'), + section = c.doc(), + text = section.children()[0].children()[0]; + + text.split({offset: 5}); + expect(section.children().length).to.equal(2, 'section has two children'); + + var header1 = section.children()[0]; + var header2 = section.children()[1]; + + expect(header1.wlxmlTag).to.equal('header', 'first section child represents wlxml header'); + expect(header1.children().length).to.equal(1, 'first header has one text child'); + expect(header1.children()[0].getText()).to.equal('Some ', 'first header has correct content'); + expect(header2.wlxmlTag).to.equal('header', 'second section child represents wlxml header'); + expect(header2.children().length).to.equal(1, 'second header has one text child'); + expect(header2.children()[0].getText()).to.equal('header', 'second header has correct content'); + }); + + it('keeps DocumentTextElement\'s parent\'s children elements intact', function() { + var c = canvas.fromXML('\ +
\ +
\ + A fancy and nice header\ +
\ +
'), + section = c.doc(), + header = section.children()[0], + textAnd = header.children()[2]; + + textAnd.split({offset: 2}); + + var sectionChildren = section.children(); + expect(sectionChildren.length).to.equal(2, 'Section has two children'); + expect(sectionChildren[0].wlxmlTag).to.equal('header', 'First section element is a wlxml header'); + expect(sectionChildren[1].wlxmlTag).to.equal('header', 'Second section element is a wlxml header'); + + var firstHeaderChildren = sectionChildren[0].children(); + expect(firstHeaderChildren.length).to.equal(3, 'First header has three children'); + expect(firstHeaderChildren[0].getText()).to.equal('A ', 'First header starts with a text'); + expect(firstHeaderChildren[1].wlxmlTag).to.equal('span', 'First header has span in the middle'); + expect(firstHeaderChildren[2].getText()).to.equal(' a', 'First header ends with text'); + + var secondHeaderChildren = sectionChildren[1].children(); + expect(secondHeaderChildren.length).to.equal(3, 'Second header has three children'); + expect(secondHeaderChildren[0].getText()).to.equal('nd ', 'Second header starts with text'); + expect(secondHeaderChildren[1].wlxmlTag).to.equal('span', 'Second header has span in the middle'); + expect(secondHeaderChildren[2].getText()).to.equal(' header', 'Second header ends with text'); + }); + }); + describe('wrapping', function() { it('wraps DocumentNodeElement', function() { var c = canvas.fromXML('
'), diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js index d90fe63..62c6731 100644 --- a/modules/documentCanvas/canvas/documentElement.js +++ b/modules/documentCanvas/canvas/documentElement.js @@ -11,7 +11,9 @@ var DocumentElement = function(htmlElement, canvas) { return; this.canvas = canvas; this.$element = $(htmlElement); - this.wlxmlTag = this.$element.prop('tagName'); + + var tagNameProp = this.$element.prop('tagName'); + this.wlxmlTag = tagNameProp ? tagNameProp.toLowerCase() : undefined; }; $.extend(DocumentElement.prototype, { @@ -118,7 +120,7 @@ DocumentNodeElement.createDOM = function(params) { }; -DocumentNodeElement.create = function(params) { +DocumentNodeElement.create = function(params, canvas) { return documentElementFromHTMLElement(DocumentNodeElement.createDOM(params)[0]); }; @@ -156,6 +158,37 @@ $.extend(DocumentTextElement.prototype, { } else { return DocumentElement.prototype.wrapWithNodeElement.call(this, wlxmlNode); } + }, + split: function(params) { + var parentElement = this.parent(), + myIdx = parentElement.childIndex(this), + myCanvas = this.canvas, + passed = false, + succeedingChildren = [], + thisElement = this, + prefix = this.getText().substr(0, params.offset), + suffix = this.getText().substr(params.offset); + + parentElement.children().forEach(function(child) { + if(passed) + succeedingChildren.push(child); + if(child.sameNode(thisElement)) + passed = true; + }); + + if(prefix.length > 0) + this.setText(prefix); + else + this.remove(); + + var newElement = DocumentNodeElement.create({tag: parentElement.wlxmlTag, klass: parentElement.wlxmlClass}, myCanvas); + parentElement.after(newElement); + + if(suffix.length > 0) + newElement.append({text: suffix}); + succeedingChildren.forEach(function(child) { + newElement.append(child); + }); } }); -- 2.20.1