refactor

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index d883835..ee0a174 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -175,37 +175,63 @@ $.extend(Canvas.prototype.list, {
 
         var idx1 = list.childIndex(params.element1),
             idx2 = list.childIndex(params.element2),
+            precedingItems = [],
             extractedItems = [],
             succeedingItems = [],
             items = list.children(),
+            listIsNested = list.parent().getWlxmlClass() === 'item',
             i;
 
-        for(i = Math.min(idx1,idx2); i <= Math.max(idx1, idx2); i++) {
-            extractedItems.push(items[i]);
-            items[i].detach();
-        }
-        for(i = i; i < items.length; i++) {
-            succeedingItems.push(items[i]);
-            items[i].detach();
+        if(idx1 > idx2) {
+            var tmp = idx1; idx1 = idx2; idx2 = tmp;
         }
 
-        var last = list;
-        extractedItems.forEach(function(item) {
-            item.setWlxmlClass(null); //
-            last.after(item);
-            last = item;
+        items.forEach(function(item, idx) {
+            if(idx < idx1)
+                precedingItems.push(item);
+            else if(idx >= idx1 && idx <= idx2) {
+                extractedItems.push(item);
+            }
+            else {
+                succeedingItems.push(item);
+            }
         });
 
-        if(list.children().length === 0)
-            list.detach();
-
-        if(succeedingItems.length > 0) {
-            var secondList = documentElement.DocumentNodeElement.create({tag: 'div', klass:'list-items'}, this);
-            last.after(secondList);
-
+        var reference = listIsNested ? list.parent() : list;
+        if(succeedingItems.length === 0) {
+            var reference_orig = reference;
+            extractedItems.forEach(function(item) {
+                reference.after(item);
+                reference = item;
+                if(!listIsNested)
+                    item.setWlxmlClass(null);
+            });
+            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.after(item);
+                if(!listIsNested)
+                    item.setWlxmlClass(null);
+                reference = item;
+            });
+            var secondList = documentElement.DocumentNodeElement.create({tag: 'div', klass:'list-items'}, this),
+                toAdd = secondList;
+            
+            if(listIsNested) {
+                toAdd = secondList.wrapWithNodeElement({tag: 'div', klass:'item'});
+            }
             succeedingItems.forEach(function(item) {
                 secondList.append(item);
             });
+
+            reference.after(toAdd);
         }
     }
 });