X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/04bf18e5d4d0d3d4a3663b8979eaf98417f44140..988d47428991ee70383755b5b4f6d337d3049fee:/modules/documentCanvas/canvas/canvas.test3.js?ds=inline

diff --git a/modules/documentCanvas/canvas/canvas.test3.js b/modules/documentCanvas/canvas/canvas.test3.js
index 6f28439..ff7c5c4 100644
--- a/modules/documentCanvas/canvas/canvas.test3.js
+++ b/modules/documentCanvas/canvas/canvas.test3.js
@@ -358,6 +358,8 @@ describe('Canvas', function() {
 
                     expect(returned.sameNode(parent)).to.be.true;
                     expect(returned.sameNode(parent2)).to.be.true;
+                    expect(returned.getWlxmlTag()).to.equal('header');
+                    expect(returned.getWlxmlClass()).to.equal('some.class');
                 });
                 it('wraps DocumentTextElement', function() {
                     var c = canvas.fromXML('<section>Alice</section>'),
@@ -369,6 +371,8 @@ describe('Canvas', function() {
 
                     expect(returned.sameNode(parent)).to.be.true;
                     expect(returned.sameNode(parent2)).to.be.true;
+                    expect(returned.getWlxmlTag()).to.equal('header');
+                    expect(returned.getWlxmlClass()).to.equal('some.class');
                 });
                 
                 it('wraps part of DocumentTextElement', function() {
@@ -384,6 +388,8 @@ describe('Canvas', function() {
                     expect(children[0].getText()).to.equal('Alice');
 
                     expect(children[1].sameNode(returned)).to.be.true;
+                    expect(returned.getWlxmlTag()).to.equal('header');
+                    expect(returned.getWlxmlClass()).to.equal('some.class');
                     expect(children[1].children().length).to.equal(1);
                     expect(children[1].children()[0].getText()).to.equal(' has a ');
 
@@ -493,20 +499,24 @@ describe('Canvas', function() {
                             <div class="list.items">\
                                 <div class="item">0</div>\
                                 <div class="item">1</div>\
+                                <div class="item">2</div>\
                             </div>\
                         </section>'),
                         list = c.doc().children()[0],
                         item1 = list.children()[0],
-                        item2 = list.children()[1];
+                        item2 = list.children()[1],
+                        item3 = list.children()[2];
 
-                    c.list.extractItems({element1: item1, element2: item1});
+                    c.list.extractItems({element1: item1, element2: item2});
 
                     var section = c.doc(),
-                        oldItem = section.children()[0],
-                        newList = section.children()[1];
+                        oldItem1 = section.children()[0],
+                        oldItem2 = section.children()[1],
+                        newList = section.children()[2];
 
-                    expect(section.children().length).to.equal(2, 'section has two children');
-                    expect(oldItem.children()[0].getText()).to.equal('0', 'first item extracted');
+                    expect(section.children().length).to.equal(3, 'section has three children');
+                    expect(oldItem1.children()[0].getText()).to.equal('0', 'first item extracted');
+                    expect(oldItem2.children()[0].getText()).to.equal('1', 'second item extracted');
                     expect(newList.is('list')).to.equal(true, 'list lies below extracted item');
                     expect(newList.children().length).to.equal(1, 'list has now one child');
                 });
@@ -517,20 +527,24 @@ describe('Canvas', function() {
                             <div class="list.items">\
                                 <div class="item">0</div>\
                                 <div class="item">1</div>\
+                                <div class="item">2</div>\
                             </div>\
                         </section>'),
                         list = c.doc().children()[0],
                         item1 = list.children()[0],
-                        item2 = list.children()[1];
+                        item2 = list.children()[1],
+                        item3 = list.children()[2];
 
-                    c.list.extractItems({element1: item2, element2: item2});
+                    c.list.extractItems({element1: item2, element2: item3});
 
                     var section = c.doc(),
-                        oldItem = section.children()[1],
+                        oldItem1 = section.children()[1],
+                        oldItem2 = section.children()[2],
                         newList = section.children()[0];
 
-                    expect(section.children().length).to.equal(2, 'section has two children');
-                    expect(oldItem.children()[0].getText()).to.equal('1', 'first item extracted');
+                    expect(section.children().length).to.equal(3, 'section has three children');
+                    expect(oldItem1.children()[0].getText()).to.equal('1', 'first item extracted');
+                    expect(oldItem2.children()[0].getText()).to.equal('2', 'second item extracted');
                     expect(newList.is('list')).to.equal(true, 'list lies above extracted item');
                     expect(newList.children().length).to.equal(1, 'list has now one child');
                 });
@@ -540,20 +554,189 @@ describe('Canvas', function() {
                         <section>\
                             <div class="list.items">\
                                 <div class="item">some item</div>\
+                                <div class="item">some item 2</div>\
                             </div>\
                         </section>'),
                         list = c.doc().children()[0],
-                        item = list.children()[0];
+                        item1 = list.children()[0],
+                        item2 = list.children()[1];
 
-                    c.list.extractItems({element1: item, element2: item});
+                    c.list.extractItems({element1: item1, element2: item2});
 
                     var section = c.doc(),
                         list1 = section.children()[0],
-                        oldItem1 = section.children()[1],
-                        oldItem2 = section.children()[2],
-                        list2 = section.children()[3];
+                        oldItem1 = section.children()[0],
+                        oldItem2 = section.children()[1];
 
-                    expect(section.children().length).to.equal(1, 'section contains one child');
+                    expect(section.children().length).to.equal(2, 'section contains two children');
+                    expect(oldItem1.children()[0].getText()).to.equal('some item');
+                    expect(oldItem2.children()[0].getText()).to.equal('some item 2');
+                });
+
+                it('creates two lists with extracted items in the middle if extracting from the middle of the list - nested case' , function() {
+                    var c = canvas.fromXML('\
+                        <section>\
+                            <div class="list.items">\
+                                <div class="item">0</div>\
+                                <div class="item">\
+                                    <div class="list.items">\
+                                        <div class="item">1.1</div>\
+                                        <div class="item">1.2</div>\
+                                        <div class="item">1.3</div>\
+                                    </div>\
+                                </div>\
+                                <div class="item">2</div>\
+                            </div>\
+                        </section>'),
+                        list = c.doc().children()[0],
+                        nestedList = list.children()[1].children()[0],
+                        nestedListItem = nestedList.children()[1];
+
+                    c.list.extractItems({element1: nestedListItem, element2: nestedListItem, merge: true});
+
+                    var section = c.doc(),
+                        list = section.children()[0],
+                        item1 = list.children()[0],
+                        item2 = list.children()[1], //
+                        item3 = list.children()[2],
+                        item4 = list.children()[3], //
+                        item5 = list.children()[4],
+                        nestedList1 = item2.children()[0],
+                        nestedList2 = item4.children()[0];
+
+                    expect(list.children().length).to.equal(5, 'top list has five items');
+                    
+                    expect(item1.children()[0].getText()).to.equal('0', 'first item ok');
+
+                    expect(item2.getWlxmlClass()).to.equal('item', 'first nested list is still wrapped in item element');
+                    expect(nestedList1.children().length).to.equal(1, 'first nested list is left with one child');
+                    expect(nestedList1.children()[0].children()[0].getText()).to.equal('1.1', 'first nested list item left alone');
+                    
+                    expect(item3.children()[0].getText()).to.equal('1.2', 'third item ok');
+
+                    expect(item4.getWlxmlClass()).to.equal('item', 'second nested list is still wrapped in item element');
+                    expect(nestedList2.children().length).to.equal(1, 'second nested list is left with one child');
+                    expect(nestedList2.children()[0].children()[0].getText()).to.equal('1.3', 'second nested list item left alone');
+
+                    expect(item5.children()[0].getText()).to.equal('2', 'last item ok');
+                });
+
+                it('puts extracted items below the list if ending item is the last one - nested case' , function() {
+                    var c = canvas.fromXML('\
+                        <section>\
+                            <div class="list.items">\
+                                <div class="item">0</div>\
+                                <div class="item">\
+                                    <div class="list.items">\
+                                        <div class="item">1.1</div>\
+                                        <div class="item">1.2</div>\
+                                        <div class="item">1.3</div>\
+                                    </div>\
+                                </div>\
+                                <div class="item">2</div>\
+                            </div>\
+                        </section>'),
+                        list = c.doc().children()[0],
+                        nestedList = list.children()[1].children()[0],
+                        nestedListItem1 = nestedList.children()[1],
+                        nestedListItem2 = nestedList.children()[2];
+
+                    c.list.extractItems({element1: nestedListItem1, element2: nestedListItem2, merge: true});
+
+                    var section = c.doc(),
+                        list = section.children()[0],
+                        item1 = list.children()[0],
+                        item2 = list.children()[1],
+                        item3 = list.children()[2],
+                        item4 = list.children()[3],
+                        item5 = list.children()[4];
+                    nestedList = item2.children()[0];
+
+                    expect(list.children().length).to.equal(5, 'top list has five items');
+                    expect(item1.children()[0].getText()).to.equal('0', 'first item ok');
+                    expect(item2.getWlxmlClass()).to.equal('item', 'nested list is still wrapped in item element');
+                    expect(nestedList.children().length).to.equal(1, 'nested list is left with one child');
+                    expect(nestedList.children()[0].children()[0].getText()).to.equal('1.1', 'nested list item left alone');
+                    expect(item3.children()[0].getText()).to.equal('1.2', 'third item ok');
+                    expect(item4.children()[0].getText()).to.equal('1.3', 'fourth item ok');
+                    expect(item5.children()[0].getText()).to.equal('2', 'fifth item ok');
+                });
+
+                it('puts extracted items above the list if starting item is the first one - nested case' , function() {
+                    var c = canvas.fromXML('\
+                        <section>\
+                            <div class="list.items">\
+                                <div class="item">0</div>\
+                                <div class="item">\
+                                    <div class="list.items">\
+                                        <div class="item">1.1</div>\
+                                        <div class="item">1.2</div>\
+                                        <div class="item">1.3</div>\
+                                    </div>\
+                                </div>\
+                                <div class="item">2</div>\
+                            </div>\
+                        </section>'),
+                        list = c.doc().children()[0],
+                        nestedList = list.children()[1].children()[0],
+                        nestedListItem1 = nestedList.children()[0],
+                        nestedListItem2 = nestedList.children()[1];
+
+                    c.list.extractItems({element1: nestedListItem1, element2: nestedListItem2, merge: true});
+
+                    var section = c.doc(),
+                        list = section.children()[0],
+                        item1 = list.children()[0],
+                        item2 = list.children()[1],
+                        item3 = list.children()[2],
+                        item4 = list.children()[3],
+                        item5 = list.children()[4];
+                    nestedList = item4.children()[0];
+
+                    expect(list.children().length).to.equal(5, 'top list has five items');
+                    expect(item1.children()[0].getText()).to.equal('0', 'first item ok');
+                    expect(item2.children()[0].getText()).to.equal('1.1', 'second item ok');
+                    expect(item3.children()[0].getText()).to.equal('1.2', 'third item ok');
+                    
+                    expect(item4.getWlxmlClass()).to.equal('item', 'nested list is still wrapped in item element');
+                    expect(nestedList.children().length).to.equal(1, 'nested list is left with one child');
+                    expect(nestedList.children()[0].children()[0].getText()).to.equal('1.3', 'nested list item left alone');
+                    expect(item5.children()[0].getText()).to.equal('2', 'fifth item ok');
+                });
+
+                it('removes list if all its items are extracted - nested case', function() {
+                    var c = canvas.fromXML('\
+                        <section>\
+                            <div class="list.items">\
+                                <div class="item">0</div>\
+                                <div class="item">\
+                                    <div class="list.items">\
+                                        <div class="item">1.1</div>\
+                                        <div class="item">1.2</div>\
+                                    </div>\
+                                </div>\
+                                <div class="item">2</div>\
+                            </div>\
+                        </section>'),
+                        list = c.doc().children()[0],
+                        nestedList = list.children()[1].children()[0],
+                        nestedListItem1 = nestedList.children()[0],
+                        nestedListItem2 = nestedList.children()[1];
+
+                    c.list.extractItems({element1: nestedListItem1, element2: nestedListItem2, merge: true});
+
+                    var section = c.doc(),
+                        list = section.children()[0],
+                        item1 = list.children()[0],
+                        item2 = list.children()[1],
+                        item3 = list.children()[2],
+                        item4 = list.children()[3];
+
+                    expect(list.children().length).to.equal(4, 'top list has four items');
+                    expect(item1.children()[0].getText()).to.equal('0', 'first item ok');
+                    expect(item2.children()[0].getText()).to.equal('1.1', 'second item ok');
+                    expect(item3.children()[0].getText()).to.equal('1.2', 'third item ok');
+                    expect(item4.children()[0].getText()).to.equal('2', 'fourth item ok');
                 });
             });
         });