X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/e0aad96df245c7148966887cbcc77417a4b7675b..34c9285ef29074d0c13cea81fbb05e93eb369b4a:/src/editor/modules/documentCanvas/canvas/canvas.test.js?ds=sidebyside

diff --git a/src/editor/modules/documentCanvas/canvas/canvas.test.js b/src/editor/modules/documentCanvas/canvas/canvas.test.js
index 9059e3f..f64754f 100644
--- a/src/editor/modules/documentCanvas/canvas/canvas.test.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.test.js
@@ -4,8 +4,9 @@ define([
 '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 */
@@ -124,7 +125,7 @@ describe('Listening to document changes', function() {
             aTextElement;
 
         canvas.fromXMLDocument(doc);
-        aTextElement = utils.findCanvasElementInParent(aTextNode, aTextNode.parent()); // TODO: This really should be easier...
+        aTextElement = utils.getElementForNode(aTextNode);
 
         aTextElement.setText('');
 
@@ -219,6 +220,24 @@ describe('Default document changes handling', function() {
         expect(sectionChildren[1].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.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() {
         var c = getCanvasFromXML('<section>Alice</section>');
         c.wlxmlDocument.root.contents()[0].setText('cat');
@@ -228,20 +247,20 @@ describe('Default document changes handling', function() {
     
 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);
@@ -254,13 +273,16 @@ describe('Custom elements based on wlxml class attribute', function() {
                     void(event);
                     this.refresh2();
                 }
-            }, extending: {tag: 'div'}}
+        });
+
+        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'});
@@ -301,7 +323,7 @@ describe('Cursor', 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');
@@ -335,7 +357,7 @@ describe('Cursor', function() {
 
     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'),
@@ -436,7 +458,7 @@ describe('Cursor', function() {
 
     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'),
@@ -468,7 +490,7 @@ describe('Cursor', function() {
 
     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'),