X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/4ac9bc0d440f080281210f023fb9d8c1da42dadd..8bf6c2bb6ef0a358a3591d19d6aff7a1f7f22b92:/modules/documentCanvas/canvas.js

diff --git a/modules/documentCanvas/canvas.js b/modules/documentCanvas/canvas.js
index d0629d3..9177968 100644
--- a/modules/documentCanvas/canvas.js
+++ b/modules/documentCanvas/canvas.js
@@ -98,7 +98,7 @@ Canvas.prototype.nodeSplit = function(options) {
         var node = this;
         if(passed)
             succeedingNodes.push(node);
-        if(node.isSameNode(textNode.get(0)))
+        if(node === textNode.get(0))
             passed = true;
     });
     
@@ -125,7 +125,7 @@ Canvas.prototype.nodeRemove = function(options) {
 Canvas.prototype.listCreate = function(options) {
     var element1 = $(this.content.find('#' + options.start.getId()).get(0));
     var element2 = $(this.content.find('#' + options.end.getId()).get(0));
-    if(!element1.parent().get(0).isSameNode(element2.parent().get(0)))
+    if(!element1.parent().get(0) === element2.parent().get(0))
         return false;
         
     var parent = element1.parent();
@@ -142,7 +142,7 @@ Canvas.prototype.listCreate = function(options) {
     var canvas = this;
     parent.contents().each(function() {
         var node = this;
-        if(node.isSameNode(element1.get(0)))
+        if(node === element1.get(0))
             place = 'inside';
         if(place === 'inside') {
             var $node;
@@ -156,12 +156,24 @@ Canvas.prototype.listCreate = function(options) {
             $node.attr('wlxml-class', 'item');
             nodesToWrap.push($node);
         }
-        if(node.isSameNode(element2.get(0)))
+        if(node === element2.get(0))
             return false;
     });
     
-    var list = canvasNode.create({tag: 'div', klass: 'list-items'}).dom; //this._createNode('div', 'list-items');
-    element1.before(list);
+    var list = canvasNode.create({tag: 'div', klass: 'list-items' + (options.type === 'enum' ? '-enum' : '')}).dom; //this._createNode('div', 'list-items');
+    
+    var parentNode = options.start.parent();
+    
+    var toret;
+    if(parentNode && parentNode.isOfClass('list-items')) {
+        list.wrap('<div wlxml-tag="div" wlxml-class="item">');
+        toret = list.parent();
+    } else {
+        toret = list;
+    }
+        
+    
+    element1.before(toret);
     
     nodesToWrap.forEach(function(node) {
         node.remove();
@@ -172,11 +184,21 @@ Canvas.prototype.listCreate = function(options) {
 Canvas.prototype.listRemove = function(options) {
     var pointerElement = $(this.content.find('#' + options.pointer.getId()));
     var listElement = options.pointer.getClass() === 'list-items' ? pointerElement : 
-        pointerElement.parent('[wlxml-class="list-items"][wlxml-tag]');
+        pointerElement.parents('[wlxml-class|="list-items"][wlxml-tag]');
     
-    listElement.find('[wlxml-class=item]').each(function() {
-        $(this).removeAttr('wlxml-class');
-    });
+    var nested = false;
+    if(listElement.length > 1) {
+        listElement = $(listElement[0]);
+        nested = true;
+    }
+    
+    if(nested) {
+        listElement.unwrap();
+    } else {
+        listElement.find('[wlxml-class=item]').each(function() {
+            $(this).removeAttr('wlxml-class');
+        });
+    }
     listElement.children().unwrap();
 };
 
@@ -190,7 +212,7 @@ Canvas.prototype.getPrecedingNode = function(options) {
 
 Canvas.prototype.nodeInsideList = function(options) {
     if(options.node) {
-        if(options.node.getClass() === 'list-items' || options.node.getClass() === 'item')
+        if(options.node.isOfClass('list-items') || options.node.isOfClass('item'))
             return true;
         var pointerElement = $(this.content.find('#' + options.node.getId()));
         return pointerElement.parents('[wlxml-class=list-items], [wlxml-class=item]').length > 0;