Refactoring

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

diff --git a/modules/documentCanvas/canvasManager.js b/modules/documentCanvas/canvasManager.js
index b6a316e..b7e7212 100644 (file)
--- a/modules/documentCanvas/canvasManager.js
+++ b/modules/documentCanvas/canvasManager.js
@@ -109,11 +109,20 @@ Manager.prototype.insertNewNode = function(wlxmlTag, wlxmlClass) {
             offsetStart = offsetEnd;\r
             offsetEnd = tmp;\r
         }\r
             offsetStart = offsetEnd;\r
             offsetEnd = tmp;\r
         }\r

+        \r
+        \r

         var wrapper = canvasNode.create({tag: wlxmlTag, klass: wlxmlClass});\r
         var wrapper = canvasNode.create({tag: wlxmlTag, klass: wlxmlClass});\r

-        this.canvas.nodeWrap({inside: canvasNode.create($(selection.anchorNode).parent()),\r
+        var parent = $(selection.anchorNode).parent();\r
+        \r
+        var textNodeIdx = parent.contents().index($(selection.anchorNode));\r
+        if(selection.anchorNode != selection.focusNode) {\r
+            textNodeIdx = [textNodeIdx, parent.contents().index($(selection.focusNode))];\r
+        }\r
+        this.canvas.nodeWrap({inside: canvasNode.create(parent),\r

                               _with: wrapper,\r
                               offsetStart: offsetStart,\r
                               _with: wrapper,\r
                               offsetStart: offsetStart,\r

-                              offsetEnd: offsetEnd\r
+                              offsetEnd: offsetEnd,\r
+                              textNodeIdx: textNodeIdx\r

                             });\r
         this.selectNode(wrapper, {movecaret: 'end'});\r
     }\r
                             });\r
         this.selectNode(wrapper, {movecaret: 'end'});\r
     }\r


@@ -186,7 +195,7 @@ Manager.prototype.onEnterKey = function(e) {
 \r
     if(pos.isAtEnd) {\r
         newNode = canvasNode.create({tag: pos.parentNode.attr('wlxml-tag'), klass: pos.parentNode.attr('wlxml-class')});\r
 \r
     if(pos.isAtEnd) {\r
         newNode = canvasNode.create({tag: pos.parentNode.attr('wlxml-tag'), klass: pos.parentNode.attr('wlxml-class')});\r

-        this.canvas.nodeInsertAfter({node: newNode, after: canvas.getNodeById(pos.parentNode.attr('id'))});\r
+        this.canvas.nodeInsertAfter({node: newNode, after: this.canvas.getNodeById(pos.parentNode.attr('id'))});\r

     } else {\r
         newNode = this.canvas.nodeSplit({node: contextNode, textNodeIdx: pos.textNodeIndex, offset: pos.textNodeOffset});\r
     }\r
     } else {\r
         newNode = this.canvas.nodeSplit({node: contextNode, textNodeIdx: pos.textNodeIndex, offset: pos.textNodeOffset});\r
     }\r


@@ -217,17 +226,17 @@ Manager.prototype.command = function(command, meta) {
     \r
     if(command === 'createList') {\r
         var node = canvasNode.create(pos.parentNode);\r
     \r
     if(command === 'createList') {\r
         var node = canvasNode.create(pos.parentNode);\r

-        if(window.getSelection().getRangeAt().collapsed && this.canvas.nodeInsideList({node: node})) {\r
+        if(window.getSelection().getRangeAt(0).collapsed && this.canvas.nodeInsideList({node: node})) {\r

             this.canvas.listRemove({pointer: node});\r
             this.selectNode(node, {movecaret: 'end'});\r
             this.sandbox.publish('contentChanged');\r
         }\r
         else {\r
             this.canvas.listRemove({pointer: node});\r
             this.selectNode(node, {movecaret: 'end'});\r
             this.sandbox.publish('contentChanged');\r
         }\r
         else {\r

-            if(!this.canvas.nodeInsideList({node: node})) {\r
+            //if(!this.canvas.nodeInsideList({node: node})) {\r

                 this.canvas.listCreate({start: node, end: canvasNode.create(pos.focusNode), type: meta});\r
                 this.selectNode(node, {movecaret: 'end'});\r
                 this.sandbox.publish('contentChanged');\r
                 this.canvas.listCreate({start: node, end: canvasNode.create(pos.focusNode), type: meta});\r
                 this.selectNode(node, {movecaret: 'end'});\r
                 this.sandbox.publish('contentChanged');\r

-            }\r
+            //}\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r