Fix: publishing the right element as current text element on selecting node element

[fnpeditor.git] / modules / documentCanvas / canvas / canvas.test3.js

diff --git a/modules/documentCanvas/canvas/canvas.test3.js b/modules/documentCanvas/canvas/canvas.test3.js
index a4e0c2e..43c9083 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.test3.js
+++ b/modules/documentCanvas/canvas/canvas.test3.js
@@ -27,10 +27,18 @@ describe('Canvas', function() {
                 </section>\
             ');
             var expected = '<div wlxml-tag="section">'
                 </section>\
             ');
             var expected = '<div wlxml-tag="section">'

-                            + 'This is some text without its own wrapping tag.'
-                            + '<div wlxml-tag="div" wlxml-class="p-subclass">This is a paragraph.</div>'
-                            + '<div wlxml-tag="div">This is text in a div <div wlxml-tag="span">with some inline text</div>.</div>'
-                            + 'This is some text without its own wrapping tag.'
+                            + '<div wlxml-text>This is some text without its own wrapping tag.</div>'
+                            + '<div wlxml-tag="div" wlxml-class="p-subclass">'
+                            +   '<div wlxml-text>This is a paragraph.</div>'
+                            + '</div>'
+                            + '<div wlxml-tag="div">'
+                            +   '<div wlxml-text>This is text in a div </div>'
+                            +   '<div wlxml-tag="span">'
+                            +       '<div wlxml-text>with some inline text</div>'
+                            +   '</div>'
+                            +   '<div wlxml-text>.</div>'
+                            + '</div>'
+                            + '<div wlxml-text>This is some text without its own wrapping tag.</div>'

                             + '</div>';
             expect(c.doc().dom()[0].isEqualNode($(expected)[0])).to.be.true;
         });
                             + '</div>';
             expect(c.doc().dom()[0].isEqualNode($(expected)[0])).to.be.true;
         });


@@ -54,9 +62,13 @@ describe('Canvas', function() {
     });
 
     describe('Internal HTML representation of a DocumentTextElement', function() {
     });
 
     describe('Internal HTML representation of a DocumentTextElement', function() {

-        it('is just a TextNode', function() {
+        it('is text node wrapped in a div with wlxml-text attribute set', function() {

             var dom = canvas.fromXML('<section>Alice</section>').doc().children()[0].dom();
             var dom = canvas.fromXML('<section>Alice</section>').doc().children()[0].dom();

-            expect(dom[0].nodeType === Node.TEXT_NODE);
+            expect(dom.prop('tagName')).to.equal('DIV');
+            expect(dom.attr('wlxml-text')).to.equal('');
+            expect(dom.contents().length).to.equal(1);
+            expect(dom.contents()[0].nodeType).to.equal(Node.TEXT_NODE);
+            expect($(dom.contents()[0]).text()).to.equal('Alice');

         });
     });
 
         });
     });
 


@@ -68,7 +80,14 @@ describe('Canvas', function() {
 
         it('gives access to its document root node', function() {
             var c = canvas.fromXML('<section></section>');
 
         it('gives access to its document root node', function() {
             var c = canvas.fromXML('<section></section>');

-            expect(c.doc().wlxmlTag).to.equal('section');
+            expect(c.doc().getWlxmlTag()).to.equal('section');
+        });
+
+        describe('root element', function() {
+            it('has no parent', function() {
+                var c = canvas.fromXML('<section></section>');
+                expect(c.doc().parent()).to.be.null;
+            });

         });
 
         describe('DocumentTextElement', function() {
         });
 
         describe('DocumentTextElement', function() {


@@ -119,8 +138,13 @@ describe('Canvas', function() {
         
         it('returns DocumentTextElement instance from Text Node', function() {
             var c = canvas.fromXML('<section>Alice</section>'),
         
         it('returns DocumentTextElement instance from Text Node', function() {
             var c = canvas.fromXML('<section>Alice</section>'),

-                textNode = c.doc().children(0)[0].dom().get(0),
+                aliceElement = c.doc().children()[0],
+                textNode = aliceElement.dom().contents()[0],

                 element = c.getDocumentElement(textNode);
                 element = c.getDocumentElement(textNode);

+
+            expect(textNode.nodeType).to.equal(Node.TEXT_NODE, 'text node selected');
+            expect($(textNode).text()).to.equal('Alice');
+

             expect(element).to.be.instanceOf(documentElement.DocumentTextElement);
             expect(element.sameNode(c.doc().children()[0]));
         });
             expect(element).to.be.instanceOf(documentElement.DocumentTextElement);
             expect(element.sameNode(c.doc().children()[0]));
         });


@@ -243,6 +267,32 @@ describe('Canvas', function() {
                     expect(c.doc().children()[2].getText()).to.equal(' cat');
                 });
             });
                     expect(c.doc().children()[2].getText()).to.equal(' cat');
                 });
             });

+
+            describe('getting vertically first text element', function() {
+                it('returns the first child if it\'s text element, ignores metadata', function() {
+                    var c = canvas.fromXML('<section><metadata><dc:author>author</dc:author></metadata>Alice<div>has</div>a cat</section>'),
+                        first = c.doc().getVerticallyFirstTextElement();
+
+                    expect(first.sameNode(c.doc().children()[1])).to.be.true;
+                });
+
+                it('looks recursively inside node elements if they precede text element', function() {
+                    var c = canvas.fromXML('\
+                            <section>\
+                                <div>\
+                                    <div>\
+                                        Alice\
+                                    </div>\
+                                </div>\
+                                Some text\
+                            </section>'),
+                        textAlice = c.doc().children()[0].children()[0].children()[0],
+                        first = c.doc().getVerticallyFirstTextElement();
+
+                    expect(textAlice).to.be.instanceOf(documentElement.DocumentTextElement);
+                    expect(first.sameNode(textAlice)).to.be.true;
+                });
+            });

         });
 
         describe('manipulation api', function() {
         });
 
         describe('manipulation api', function() {


@@ -254,7 +304,7 @@ describe('Canvas', function() {
                         children = c.doc().children();
 
                     expect(children.length).to.equal(1);
                         children = c.doc().children();
 
                     expect(children.length).to.equal(1);

-                    expect(children[0].sameNode(appended));
+                    expect(children[0].sameNode(appended)).to.be.true;

                 });
 
                 it('can put new TextElement at the end', function() {
                 });
 
                 it('can put new TextElement at the end', function() {


@@ -263,7 +313,7 @@ describe('Canvas', function() {
                         children = c.doc().children();
 
                     expect(children.length).to.equal(1);
                         children = c.doc().children();
 
                     expect(children.length).to.equal(1);

-                    expect(children[0].sameNode(appended));
+                    expect(children[0].sameNode(appended)).to.be.true;

                     expect(children[0].getText()).to.equal('Alice');
                 });
 
                     expect(children[0].getText()).to.equal('Alice');
                 });
 


@@ -273,7 +323,7 @@ describe('Canvas', function() {
                         added = div.after({tag: 'header', klass: 'some.class'}),
                         children = c.doc().children();
                     expect(children.length).to.equal(2);
                         added = div.after({tag: 'header', klass: 'some.class'}),
                         children = c.doc().children();
                     expect(children.length).to.equal(2);

-                    expect(children[1].sameNode(added));
+                    expect(children[1].sameNode(added)).to.be.true;

                 });
 
                 it('can put new Nodeelement before another element', function() {
                 });
 
                 it('can put new Nodeelement before another element', function() {


@@ -282,7 +332,7 @@ describe('Canvas', function() {
                         added = div.before({tag: 'header', klass: 'some.class'}),
                         children = c.doc().children();
                     expect(children.length).to.equal(2);
                         added = div.before({tag: 'header', klass: 'some.class'}),
                         children = c.doc().children();
                     expect(children.length).to.equal(2);

-                    expect(children[0].sameNode(added));
+                    expect(children[0].sameNode(added)).to.be.true;

                 });
 
                 it('can put new DocumentNodeElement after DocumentTextElement', function() {
                 });
 
                 it('can put new DocumentNodeElement after DocumentTextElement', function() {


@@ -318,18 +368,21 @@ describe('Canvas', function() {
                         section = c.doc(),
                         text = section.children()[0].children()[0];
 
                         section = c.doc(),
                         text = section.children()[0].children()[0];
 

-                    text.split({offset: 5});
+                    var returnedValue = 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(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.getWlxmlTag()).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(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.getWlxmlTag()).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');
                     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');

+
+                    expect(returnedValue.first.sameNode(header1)).to.equal(true, 'first node returnde');
+                    expect(returnedValue.second.sameNode(header2)).to.equal(true, 'second node returned');

                 });
 
                 it('leaves empty copy of DocumentNodeElement if splitting at the very beginning', function() {
                 });
 
                 it('leaves empty copy of DocumentNodeElement if splitting at the very beginning', function() {


@@ -375,19 +428,19 @@ describe('Canvas', function() {
                     
                     var sectionChildren = section.children();
                     expect(sectionChildren.length).to.equal(2, 'Section has two children');
                     
                     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');
+                    expect(sectionChildren[0].getWlxmlTag()).to.equal('header', 'First section element is a wlxml header');
+                    expect(sectionChildren[1].getWlxmlTag()).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');
 
                     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[1].getWlxmlTag()).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(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[1].getWlxmlTag()).to.equal('span', 'Second header has span in the middle');

                     expect(secondHeaderChildren[2].getText()).to.equal(' header', 'Second header ends with text');
                 });
             });
                     expect(secondHeaderChildren[2].getText()).to.equal(' header', 'Second header ends with text');
                 });
             });


@@ -490,13 +543,13 @@ describe('Canvas', function() {
 
             describe('unwrapping', function() {
                 it('unwraps DocumentTextElement from its parent DocumentNodeElement if it\'s its only child', function() {
 
             describe('unwrapping', function() {
                 it('unwraps DocumentTextElement from its parent DocumentNodeElement if it\'s its only child', function() {

-                    var c = canvas.fromXML('<section><div>Alice has a cat</div></section>'),
+                    var c = canvas.fromXML('<section>Alice <span>has a</span> cat</section>'),

                     section = c.doc(),
                     section = c.doc(),

-                    text = section.children()[0].children()[0];
+                    text = section.children()[1].children()[0];

 
                     text.unwrap();
 
 
                     text.unwrap();
 

-                    expect(section.children().length).to.equal(1);
+                    expect(section.children().length).to.equal(1, 'section has one child');

                     expect(section.children()[0].getText()).to.equal('Alice has a cat');
                 })
             });
                     expect(section.children()[0].getText()).to.equal('Alice has a cat');
                 })
             });


@@ -909,13 +962,14 @@ describe('Canvas', function() {
         it('returns position when browser selection collapsed', function() {
             var c = canvas.fromXML('<section>Alice has a cat</section>'),
                 dom = c.doc().dom(),
         it('returns position when browser selection collapsed', function() {
             var c = canvas.fromXML('<section>Alice has a cat</section>'),
                 dom = c.doc().dom(),

-                text = dom.contents(0);
+                text = $(dom.contents()[0]).contents()[0];

 
 

-            expect(text.text()).to.equal('Alice has a cat');
+            expect(text.nodeType).to.equal(Node.TEXT_NODE, 'correct node selected');
+            expect($(text).text()).to.equal('Alice has a cat');

 
             getSelection.returns({
 
             getSelection.returns({

-                anchorNode: text[0],
-                focusNode: text[0],
+                anchorNode: text,
+                focusNode: text,

                 anchorOffset: 5,
                 focusOffset: 5,
                 isCollapsed: true
                 anchorOffset: 5,
                 focusOffset: 5,
                 isCollapsed: true