X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/8254ff82e19d41b2a66a4549165b924084ed6a52..58a70817b94ce86e550c93a9a36e635e47ea594e:/modules/documentCanvas/canvas/canvas.js

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 6131e4e..ee0a174 100644
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -23,7 +23,7 @@ $.extend(Canvas.prototype, {
                 if(currentTag.attr('wlxml-tag'))
                     return;
                 var toret = $('<div>').attr('wlxml-tag', currentTag.prop('tagName').toLowerCase());
-                toret.attr('id', 'xxxxxxxx-xxxx-xxxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {var r = Math.random()*16|0,v=c=='x'?r:r&0x3|0x8;return v.toString(16);}));
+                //toret.attr('id', 'xxxxxxxx-xxxx-xxxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {var r = Math.random()*16|0,v=c=='x'?r:r&0x3|0x8;return v.toString(16);}));
                 for(var i = 0; i < this.attributes.length; i++) {
                     var attr = this.attributes.item(i);
                     var value = attr.name === 'class' ? attr.value.replace(/\./g, '-') : attr.value;
@@ -55,8 +55,10 @@ $.extend(Canvas.prototype, {
                     } else {
                         var oldLength = this.data.length;
                         this.data = $.trim(this.data);
-                        if(this.data.length === 0 && oldLength > 0)
+                        if(this.data.length === 0 && oldLength > 0 && el.parent().contents().length === 1)
                             this.data = ' ';
+                        if(this.data.length === 0)
+                            $(this).remove();
                     }
                 });
             
@@ -165,6 +167,72 @@ $.extend(Canvas.prototype.list, {
             element.detach();
             listElement.append(element);
         });
+    },
+    extractItems: function(params) {
+        var list = params.element1.parent();
+        if(!list.is('list') || !(list.sameNode(params.element2.parent())))
+            return false;
+
+        var idx1 = list.childIndex(params.element1),
+            idx2 = list.childIndex(params.element2),
+            precedingItems = [],
+            extractedItems = [],
+            succeedingItems = [],
+            items = list.children(),
+            listIsNested = list.parent().getWlxmlClass() === 'item',
+            i;
+
+        if(idx1 > idx2) {
+            var tmp = idx1; idx1 = idx2; idx2 = tmp;
+        }
+
+        items.forEach(function(item, idx) {
+            if(idx < idx1)
+                precedingItems.push(item);
+            else if(idx >= idx1 && idx <= idx2) {
+                extractedItems.push(item);
+            }
+            else {
+                succeedingItems.push(item);
+            }
+        });
+
+        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);
+        }
     }
 });