'libs/sinon',
'modules/documentCanvas/canvas/canvas',
'modules/documentCanvas/canvas/utils',
+'modules/documentCanvas/canvas/documentElement',
'wlxml/wlxml',
-], function($, chai, sinon, canvas, utils, wlxml) {
+], function($, chai, sinon, canvas, utils, documentElement, wlxml) {
'use strict';
/* global describe, it, beforeEach, afterEach */
aTextElement;
canvas.fromXMLDocument(doc);
- aTextElement = utils.findCanvasElementInParent(aTextNode, aTextNode.parent()); // TODO: This really should be easier...
+ aTextElement = utils.getElementForNode(aTextNode);
aTextElement.setText('');
});
it('handles moved node', function() {
- var doc = getDocumentFromXML('<section><a></a><b></b></section>'),
- a = doc.root.contents()[0],
- b = doc.root.contents()[1],
- c = canvas.fromXMLDocument(doc);
+ var doc = getDocumentFromXML('<section><c></c><a></a><b></b></section>'),
+ c = doc.root.contents()[0],
+ a = doc.root.contents()[1],
+ b = doc.root.contents()[2],
+ cv = canvas.fromXMLDocument(doc);
+
+ a.document.transaction(function() {
+ a.before(b); // => cab
+ b.after(c); // => bca
+ }, {
+ error: function(e) {throw e;}
+ });
- a.before(b);
+ var sectionChildren = cv.doc().children();
+ expect(sectionChildren.length).to.equal(3);
+ expect(sectionChildren[0].wlxmlNode.getTagName()).to.equal('b');
+ expect(sectionChildren[1].wlxmlNode.getTagName()).to.equal('c');
+ expect(sectionChildren[2].wlxmlNode.getTagName()).to.equal('a');
+ });
+
+ it('handles moving text node to another parent', function() {
+ var c = getCanvasFromXML('<section>Alice<div><span>has</span></div>a cat.</section>'),
+ doc = c.wlxmlDocument,
+ text = doc.root.contents()[0],
+ div = doc.root.contents()[1];
+
+ div.append(text);
+
var sectionChildren = c.doc().children();
expect(sectionChildren.length).to.equal(2);
- expect(sectionChildren[0].wlxmlNode.getTagName()).to.equal('b');
- expect(sectionChildren[1].wlxmlNode.getTagName()).to.equal('a');
+ expect(sectionChildren[0].wlxmlNode.sameNode(div)).to.equal(true);
+ expect(sectionChildren[1].getText()).to.equal('a cat.');
+
+ expect(div.contents().length).to.equal(2);
+ expect(div.contents()[0].getTagName()).to.equal('span');
+ expect(div.contents()[1].getText()).to.equal('Alice');
});
it('handles change in a text node', function() {
c.wlxmlDocument.root.contents()[0].setText('cat');
expect(c.doc().children()[0].getText()).to.equal('cat');
});
+
+ describe('Regression tests', function() {
+ it('handles moving node after its next neighbour correctly', function() {
+ var c = getCanvasFromXML('<section><a></a><b></b></section>'),
+ doc = c.wlxmlDocument,
+ a = doc.root.contents()[0],
+ b = doc.root.contents()[1];
+ b.after(a);
+ var sectionChildren = c.doc().children();
+ expect(sectionChildren[0].wlxmlNode.getTagName()).to.equal('b');
+ expect(sectionChildren[1].wlxmlNode.getTagName()).to.equal('a');
+ });
+ });
});
describe('Custom elements based on wlxml class attribute', function() {
it('allows custom rendering', function() {
- var c = getCanvasFromXML('<section><div class="testClass"></div></section>', [
- {tag: 'div', klass: 'testClass', prototype: {
+ var prototype = $.extend({}, documentElement.DocumentNodeElement.prototype, {
init: function() {
this._container().append('<test></test>');
}
- }, extending: {tag: 'div'}}
+ }),
+ c = getCanvasFromXML('<section><div class="testClass"></div></section>', [
+ {tag: 'div', klass: 'testClass', prototype: prototype}
]);
expect(c.doc().children()[0]._container().children('test').length).to.equal(1); // @!
});
it('allows handling changes to internal structure of rendered node', function() {
- var c = getCanvasFromXML('<section><div class="testClass"><a></a></div></section>', [
- {tag: 'div', klass: 'testClass', prototype: {
+ var prototype = $.extend({}, documentElement.DocumentNodeElement.prototype, {
init: function() {
this.header = $('<h1>');
this._container().append(this.header);
onNodeAdded: function(event) {
void(event);
this.refresh2();
- }
- }, extending: {tag: 'div'}}
+ },
+ onNodeTextChange: function(event) {
+ this.header.text(event.meta.node.getText());
+ },
+ children: function() { return []; }
+ });
+
+ var c = getCanvasFromXML('<section><div class="testClass"><a></a></div></section>', [
+ {tag: 'div', klass: 'testClass', prototype: prototype}
]);
var node = c.wlxmlDocument.root.contents()[0],
element = node.getData('canvasElement');
- var header = element.dom().find('h1');
+ var header = element.dom.find('h1');
expect(header.text()).to.equal('1', 'just <a>');
node.append({tagName: 'div'});
expect(header.text()).to.equal('2', 'added div');
+
+ var textNode = node.append({text: 'test'});
+
+ expect(header.text()).to.equal('3', 'added text node');
+
+ textNode.setText('test2');
+
+ expect(header.text()).to.equal('test2', 'text node change handled');
});
describe('Handling unknown class', function() {
it('returns position when browser selection collapsed', function() {
var c = getCanvasFromXML('<section>Alice has a cat</section>'),
- dom = c.doc().dom(),
+ dom = c.doc().dom,
text = findTextNode(dom, 'Alice has a cat');
expect(text.nodeType).to.equal(Node.TEXT_NODE, 'correct node selected');
it('recognizes selection start and end on document order', function() {
var c = getCanvasFromXML('<section><span>Alice</span><span>has a cat</span><div>abc<span>...</span>cde</div></section>'),
- dom = c.doc().dom(),
+ dom = c.doc().dom,
textFirst = findTextNode(dom, 'Alice'),
textSecond = findTextNode(dom, 'has a cat'),
textAbc = findTextNode(dom, 'abc'),
it('returns boundries of selection when browser selection not collapsed', function() {
var c = getCanvasFromXML('<section>Alice <span>has</span> a <span>big</span> cat</section>'),
- dom = c.doc().dom(),
+ dom = c.doc().dom,
text = {
alice: findTextNode(dom, 'Alice '),
has: findTextNode(dom, 'has'),
it('recognizes when browser selection boundries lies in sibling DocumentTextElements', function() {
var c = getCanvasFromXML('<section>Alice <span>has</span> a <span>big</span> cat</section>'),
- dom = c.doc().dom(),
+ dom = c.doc().dom,
text = {
alice: findTextNode(dom, 'Alice '),
has: findTextNode(dom, 'has'),
fnp / fnpeditor.git / blobdiff