'),
appended = c.doc().append({text: 'Alice'}),
children = c.doc().children();
- expect(children.length).to.equal(1);
- expect(children[0].sameNode(appended)).to.be.true;
+ expect(children.length).to.equal(2);
+ expect(children[1].sameNode(appended)).to.be.true;
+ expect(children[1].getText()).to.equal('Alice');
+ });
+
+ it('can put new NodeElement at the beginning', function() {
+ var c = canvas.fromXML('
'),
+ prepended = c.doc().prepend({tag: 'header', klass: 'some.class'}),
+ children = c.doc().children();
+
+ expect(children).to.have.length(2);
+ expect(children[0].sameNode(prepended)).to.be.true;
+ });
+
+ it('can put new TextElement at the beginning', function() {
+ var c = canvas.fromXML('
'),
+ prepended = c.doc().prepend({text: 'Alice'}),
+ children = c.doc().children();
+
+ expect(children).to.have.length(2)
+ expect(children[0].sameNode(prepended)).to.be.true;
expect(children[0].getText()).to.equal('Alice');
});
@@ -388,6 +473,69 @@ describe('Canvas', function() {
expect(children[1]).to.be.instanceOf(documentElement.DocumentTextElement);
expect(children[1].getText()).to.equal('Alice');
});
+
+ it('can divide DocumentTextElement with a new DocumentNodeElement', function() {
+ var c = canvas.fromXML('
'),
+ section = c.doc(),
+ text = section.children()[0];
+
+ var returned = text.divide({tag: 'aside', klass: 'footnote', offset: 5}),
+ sectionChildren = section.children(),
+ lhsText = sectionChildren[0],
+ rhsText = sectionChildren[2];
+
+ expect(lhsText.getText()).to.equal('Alice');
+ expect(returned.sameNode(sectionChildren[1]));
+ expect(rhsText.getText()).to.equal(' has a cat');
+ });
+
+ it('treats dividing DocumentTextElement at the very end as appending after it', function() {
+ var c = canvas.fromXML('
'),
+ section = c.doc(),
+ text = section.children()[0];
+
+ var returned = text.divide({tag: 'aside', klass: 'footnote', offset: 15}),
+ sectionChildren = section.children(),
+ textElement = sectionChildren[0],
+ nodeElement = sectionChildren[1];
+
+ expect(sectionChildren.length).to.equal(2);
+ expect(textElement.getText()).to.equal('Alice has a cat');
+ expect(returned.sameNode(nodeElement)).to.be.true;
+ expect(nodeElement.getWlxmlTag()).to.equal('aside');
+ });
+
+ it('treats dividing DocumentTextElement at the very beginning as appending before it', function() {
+ var c = canvas.fromXML('
'),
+ section = c.doc(),
+ text = section.children()[0];
+
+ var returned = text.divide({tag: 'aside', klass: 'footnote', offset: 0}),
+ sectionChildren = section.children(),
+ nodeElement = sectionChildren[0],
+ textElement = sectionChildren[1];
+
+ expect(sectionChildren.length).to.equal(2);
+ expect(textElement.getText()).to.equal('Alice has a cat');
+ expect(returned.sameNode(nodeElement)).to.be.true;
+ expect(nodeElement.getWlxmlTag()).to.equal('aside');
+ });
+ });
+
+ describe('Removing elements', function() {
+ it('merges left and right DocumentTextElement sibling of a detached DocumentNodeElement', function() {
+ var c = canvas.fromXML('
'),
+ 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() {
@@ -568,10 +716,76 @@ describe('Canvas', function() {
expect(wrapperChildren[2].getText()).to.equal(' cat');
});
+
+ it('wraps multiple sibling Elements', function() {
+ var c = canvas.fromXML('
'),
+ section = c.doc(),
+ aliceText = section.children()[0],
+ firstDiv = section.children()[1],
+ lastDiv = section.children()[section.children().length -1];
+
+ var returned = c.wrapElements({
+ element1: aliceText,
+ element2: lastDiv,
+ _with: {tag: 'header'}
+ });
+
+ var sectionChildren = section.children(),
+ header = sectionChildren[0],
+ headerChildren = header.children();
+
+ expect(sectionChildren).to.have.length(1);
+ expect(header.sameNode(returned)).to.equal(true, 'wrapper returned');
+ expect(headerChildren).to.have.length(3);
+ expect(headerChildren[0].sameNode(aliceText)).to.equal(true, 'first node wrapped');
+ expect(headerChildren[1].sameNode(firstDiv)).to.equal(true, 'second node wrapped');
+ expect(headerChildren[2].sameNode(lastDiv)).to.equal(true, 'third node wrapped');
+ });
+ it('wraps multiple sibling Elements - middle case', function() {
+ var c = canvas.fromXML('
'),
+ section = c.doc(),
+ div1 = section.children()[0],
+ div2 = section.children()[1],
+ div3 = section.children()[2],
+ div4 = section.children()[3];
+
+ var returned = c.wrapElements({
+ element1: div2,
+ element2: div3,
+ _with: {tag: 'header'}
+ });
+
+ var sectionChildren = section.children(),
+ header = sectionChildren[1],
+ headerChildren = header.children();
+
+ expect(sectionChildren).to.have.length(3);
+ expect(headerChildren).to.have.length(2);
+ expect(headerChildren[0].sameNode(div2)).to.equal(true, 'first node wrapped');
+ expect(headerChildren[1].sameNode(div3)).to.equal(true, 'second node wrapped');
+ });
});
- describe('unwrapping', function() {
- it('unwraps DocumentTextElement from its parent DocumentNodeElement if it\'s its only child', function() {
+ describe('unwrapping DocumentTextElement from its parent DocumentNodeElement if it\'s its only child', function() {
+ it('unwraps text element from its parent and stays between its old parent siblings', function() {
+ var c = canvas.fromXML('
'),
+ section = c.doc(),
+ sectionChildren = section.children(),
+ divAlice = sectionChildren[0],
+ divHas = sectionChildren[1],
+ textHas = divHas.children()[0],
+ divCat = sectionChildren[2];
+
+ var newTextContainer = textHas.unwrap(),
+ sectionChildren = section.children();
+
+ expect(sectionChildren[0].sameNode(divAlice)).to.equal(true, 'divAlice ok');
+ expect(newTextContainer.sameNode(section)).to.equal(true, 'unwrap returns new text parent DocumentNodeElement');
+ expect(sectionChildren[1].getText()).to.equal('has');
+ expect(sectionChildren[2].sameNode(divCat)).to.equal(true, 'divCat ok');
+
+ });
+ it('unwraps and join with its old parent adjacent text elements ', function() {
var c = canvas.fromXML('
'),
section = c.doc(),
text = section.children()[1].children()[0];
@@ -581,7 +795,20 @@ describe('Canvas', function() {
expect(section.children().length).to.equal(1, 'section has one child');
expect(section.children()[0].getText()).to.equal('Alice has a cat');
expect(newTextContainer.sameNode(c.doc())).to.equal(true, 'unwrap returns new text parent DocumentNodeElement');
- })
+ });
+
+ it('unwraps text element from its parent - first child case', function() {
+ var c = canvas.fromXML('
'),
+ section = c.doc(),
+ span = section.children()[0];
+
+ span.children()[0].unwrap();
+
+ var sectionChildren = section.children();
+
+ expect(sectionChildren).to.have.length(1);
+ expect(sectionChildren[0].getText()).to.equal('Sometext');
+ });
});
});
@@ -981,6 +1208,15 @@ describe('Canvas', function() {
var getSelection;
+ var findTextNode = function(inside, text) {
+ var nodes = inside.find(':not(iframe)').addBack().contents().filter(function() {
+ return this.nodeType === Node.TEXT_NODE && this.data === text;
+ });
+ if(nodes.length)
+ return nodes[0];
+ return null;
+ }
+
beforeEach(function() {
getSelection = sinon.stub(window, 'getSelection');
});
@@ -992,7 +1228,7 @@ describe('Canvas', function() {
it('returns position when browser selection collapsed', function() {
var c = canvas.fromXML('
'),
dom = c.doc().dom(),
- text = $(dom.contents()[0]).contents()[0];
+ text = findTextNode(dom, 'Alice has a cat');
expect(text.nodeType).to.equal(Node.TEXT_NODE, 'correct node selected');
expect($(text).text()).to.equal('Alice has a cat');
@@ -1027,9 +1263,9 @@ describe('Canvas', function() {
var c = canvas.fromXML('
'),
dom = c.doc().dom(),
text = {
- alice: dom.contents()[0],
- has: $(dom.contents()[1]).contents()[0],
- cat: dom.contents()[4]
+ alice: findTextNode(dom, 'Alice '),
+ has: findTextNode(dom, 'has'),
+ cat: findTextNode(dom, ' cat')
},
cursor = c.getCursor(),
aliceElement = c.getDocumentElement(text.alice),
@@ -1060,11 +1296,11 @@ describe('Canvas', function() {
var c = canvas.fromXML('
'),
dom = c.doc().dom(),
text = {
- alice: dom.contents()[0],
- has: $(dom.contents()[1]).contents()[0],
- a: dom.contents()[2],
- big: $(dom.contents()[3]).contents()[0],
- cat: dom.contents()[4]
+ alice: findTextNode(dom, 'Alice '),
+ has: findTextNode(dom, 'has'),
+ a: findTextNode(dom, ' a '),
+ big: findTextNode(dom, 'big'),
+ cat: findTextNode(dom, ' cat'),
},
cursor = c.getCursor();
@@ -1159,8 +1395,9 @@ describe('Canvas', function() {
it('keeps white space between XML nodes - inline case', function() {
var xmlIn = '
',
- c = canvas.fromXML(xmlIn),
- xmlOut = c.toXML();
+ c = canvas.fromXML(xmlIn);
+
+ var xmlOut = c.toXML();
var partsIn = xmlIn.split('\n\n\n'),
partsOut = xmlOut.split('\n\n\n');