Fixing creation of a nested list

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 3eb4c6e..5ff19bd 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -135,7 +135,8 @@ $.extend(Canvas.prototype.list, {
         
         var place = 'before';
         var canvas = this;
         
         var place = 'before';
         var canvas = this;

-        parent.children().forEach(function(element) {
+        parent.children().some(function(element) {
+            var _e = element;

             if(element.sameNode(params.element1))
                 place = 'inside';
             if(place === 'inside') {
             if(element.sameNode(params.element1))
                 place = 'inside';
             if(place === 'inside') {


@@ -147,15 +148,15 @@ $.extend(Canvas.prototype.list, {
                 element.setWlxmlClass('item');
                 elementsToWrap.push(element);
             }
                 element.setWlxmlClass('item');
                 elementsToWrap.push(element);
             }

-            if(element.sameNode(params.element2))
-                return false;
+            if(_e.sameNode(params.element2))
+                return true;

         });
         
         var listElement = documentElement.DocumentNodeElement.create({tag: 'div', klass: 'list-items' + (params.type === 'enum' ? '-enum' : '')});
         
         var toret;
         if(parent.is('list')) {
         });
         
         var listElement = documentElement.DocumentNodeElement.create({tag: 'div', klass: 'list-items' + (params.type === 'enum' ? '-enum' : '')});
         
         var toret;
         if(parent.is('list')) {

-            listElement.wrap({tag: 'div', klass: 'item'});
+            listElement.wrapWithNodeElement({tag: 'div', klass: 'item'});

             toret = listElement.parent();
         } else {
             toret = listElement;
             toret = listElement.parent();
         } else {
             toret = listElement;


@@ -199,7 +200,7 @@ $.extend(Canvas.prototype.list, {
 
         var reference = listIsNested ? list.parent() : list;
         if(succeedingItems.length === 0) {
 
         var reference = listIsNested ? list.parent() : list;
         if(succeedingItems.length === 0) {

-            var list = reference;
+            var reference_orig = reference;

             extractedItems.forEach(function(item) {
                 reference.after(item);
                 reference = item;
             extractedItems.forEach(function(item) {
                 reference.after(item);
                 reference = item;


@@ -207,7 +208,7 @@ $.extend(Canvas.prototype.list, {
                     item.setWlxmlClass(null);
             });
             if(precedingItems.length === 0)
                     item.setWlxmlClass(null);
             });
             if(precedingItems.length === 0)

-                list.detach();
+                reference_orig.detach();

         } else if(precedingItems.length === 0) {
             extractedItems.forEach(function(item) {
                 reference.before(item);
         } else if(precedingItems.length === 0) {
             extractedItems.forEach(function(item) {
                 reference.before(item);


@@ -215,12 +216,11 @@ $.extend(Canvas.prototype.list, {
                     item.setWlxmlClass(null);
             });
         } else {
                     item.setWlxmlClass(null);
             });
         } else {

-            var ptr = reference;

             extractedItems.forEach(function(item) {
             extractedItems.forEach(function(item) {

-                ptr.after(item);
+                reference.after(item);

                 if(!listIsNested)
                     item.setWlxmlClass(null);
                 if(!listIsNested)
                     item.setWlxmlClass(null);

-                ptr = item;
+                reference = item;

             });
             var secondList = documentElement.DocumentNodeElement.create({tag: 'div', klass:'list-items'}, this),
                 toAdd = secondList;
             });
             var secondList = documentElement.DocumentNodeElement.create({tag: 'div', klass:'list-items'}, this),
                 toAdd = secondList;


@@ -232,7 +232,7 @@ $.extend(Canvas.prototype.list, {
                 secondList.append(item);
             });
 
                 secondList.append(item);
             });
 

-            ptr.after(toAdd);
+            reference.after(toAdd);

         }
     }
 });
         }
     }
 });