fixing wrapping DocumentElements

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index ba7daef..d883835 100644 (file)
--- 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;
@@ -53,7 +53,12 @@ $.extend(Canvas.prototype, {
                                     + (endSpace && (spanParent || spanAfter) ? ' ' : '');
 
                     } else {
+                        var oldLength = this.data.length;
                         this.data = $.trim(this.data);
+                        if(this.data.length === 0 && oldLength > 0 && el.parent().contents().length === 1)
+                            this.data = ' ';
+                        if(this.data.length === 0)
+                            $(this).remove();
                     }
                 });
             
@@ -162,6 +167,46 @@ $.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),
+            extractedItems = [],
+            succeedingItems = [],
+            items = list.children(),
+            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();
+        }
+
+        var last = list;
+        extractedItems.forEach(function(item) {
+            item.setWlxmlClass(null); //
+            last.after(item);
+            last = 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);
+
+            succeedingItems.forEach(function(item) {
+                secondList.append(item);
+            });
+        }
     }
 });