refactor

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index eb4e152..ee0a174 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -198,32 +198,28 @@ $.extend(Canvas.prototype.list, {
         });
 
         var reference = listIsNested ? list.parent() : list;
         });
 
         var reference = listIsNested ? list.parent() : list;

-        if(precedingItems.length === 0 && succeedingItems.length === 0) {
+        if(succeedingItems.length === 0) {
+            var reference_orig = reference;

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

+                reference = item;

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

-            reference.detach();
-        } else if(precedingItems.length > 0 && succeedingItems.length === 0) {
-            extractedItems.forEach(function(item) {
-                reference.after(item);
-                if(!listIsNested)
-                    item.setWlxmlClass(null);
-            });
-        } else if(precedingItems.length === 0 && succeedingItems.length > 0) {
+            if(precedingItems.length === 0)
+                reference_orig.detach();
+        } else if(precedingItems.length === 0) {

             extractedItems.forEach(function(item) {
                 reference.before(item);
                 if(!listIsNested)
                     item.setWlxmlClass(null);
             });
         } else {
             extractedItems.forEach(function(item) {
                 reference.before(item);
                 if(!listIsNested)
                     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;


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

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

         }
     }
 });
         }
     }
 });