X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/12763ff44e918f409a0ede75a4da383d8bdc6d95..49d0411a1353ff5289f5b2021f7f439e4b8f1487:/modules/documentCanvas/canvasManager.js

diff --git a/modules/documentCanvas/canvasManager.js b/modules/documentCanvas/canvasManager.js
index da9b941..b7e7212 100644
--- a/modules/documentCanvas/canvasManager.js
+++ b/modules/documentCanvas/canvasManager.js
@@ -109,11 +109,20 @@ Manager.prototype.insertNewNode = function(wlxmlTag, wlxmlClass) {
             offsetStart = offsetEnd;
             offsetEnd = tmp;
         }
+        
+        
         var wrapper = canvasNode.create({tag: wlxmlTag, klass: wlxmlClass});
-        this.canvas.nodeWrap({inside: canvasNode.create($(selection.anchorNode).parent()),
+        var parent = $(selection.anchorNode).parent();
+        
+        var textNodeIdx = parent.contents().index($(selection.anchorNode));
+        if(selection.anchorNode != selection.focusNode) {
+            textNodeIdx = [textNodeIdx, parent.contents().index($(selection.focusNode))];
+        }
+        this.canvas.nodeWrap({inside: canvasNode.create(parent),
                               _with: wrapper,
                               offsetStart: offsetStart,
-                              offsetEnd: offsetEnd
+                              offsetEnd: offsetEnd,
+                              textNodeIdx: textNodeIdx
                             });
         this.selectNode(wrapper, {movecaret: 'end'});
     }
@@ -217,17 +226,17 @@ Manager.prototype.command = function(command, meta) {
     
     if(command === 'createList') {
         var node = canvasNode.create(pos.parentNode);
-        if(window.getSelection().getRangeAt().collapsed && this.canvas.nodeInsideList({node: node})) {
+        if(window.getSelection().getRangeAt(0).collapsed && this.canvas.nodeInsideList({node: node})) {
             this.canvas.listRemove({pointer: node});
             this.selectNode(node, {movecaret: 'end'});
             this.sandbox.publish('contentChanged');
         }
         else {
-            if(!this.canvas.nodeInsideList({node: node})) {
+            //if(!this.canvas.nodeInsideList({node: node})) {
                 this.canvas.listCreate({start: node, end: canvasNode.create(pos.focusNode), type: meta});
                 this.selectNode(node, {movecaret: 'end'});
                 this.sandbox.publish('contentChanged');
-            }
+            //}
         }
     }