X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/f87e25a2b4d41deadb65308b278496ad2ff995d3..d5f4c1bb0dc3a9ff8845d209c75d00cc733b3360:/src/editor/modules/documentCanvas/commands.js?ds=sidebyside

diff --git a/src/editor/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js
index ce49c78..2bd77c0 100644
--- a/src/editor/modules/documentCanvas/commands.js
+++ b/src/editor/modules/documentCanvas/commands.js
@@ -47,11 +47,7 @@ commands.register('unwrap-node', function(canvas) {
         node2 = parent2.data('wlxmlNode'),
         doc = node1.document;
     if(doc.areItemsOfSameList({node1: node1, node2: node2})) {
-
-
         doc.extractItems({item1: node1, item2: node2});
-
-        //canvas.list.extractItems({element1: parent1, element2: parent2});
         canvas.setCurrentElement(selectionAnchor.element, {caretTo: selectionAnchor.offset});
     } else if(!cursor.isSelecting()) {
         var nodeToUnwrap = cursor.getPosition().element.data('wlxmlNode'),
@@ -73,9 +69,7 @@ commands.register('wrap-node', function(canvas) {
         node2 = parent2.data('wlxmlNode'),
         doc = node1.document;
 
-    if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
-        //canvas.list.create({element1: parent1, element2: parent2});
-        //doc.transform('createList', {node1: node1, node2: node2});
+    if(doc.areItemsOfSameList({node1: node1, node2: node2})) {
         doc.createList({node1: node1, node2: node2});
     }
 });
@@ -98,10 +92,7 @@ commands.register('list', function(canvas, params) {
         node2 = parent2.data('wlxmlNode'),
         doc = node1.document;
     
-    //doc.transform('createList', {node1: node1, node2: node2});
     doc.createList({node1: node1, node2: node2});
-
-
     canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
 });
 
@@ -121,8 +112,7 @@ commands.register('newNodeRequested', function(canvas, params) {
             if(cursor.isSelectingWithinElement()) {
                 wlxmlNode = selectionStart.element.data('wlxmlNode');
                 caretTo = selectionStart.offset < selectionEnd.offset ? 'start' : 'end';
-                    //wrapper = wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset}),
-                    //wrapper = wlxmlNode.transform('smartxml.wrapWith', {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset})
+
                 wrapper = wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset});
                 wrapperCanvasElement = utils.findCanvasElement(wrapper);
                 canvas.setCurrentElement(wrapperCanvasElement.children()[0], {caretTo: caretTo});
@@ -131,12 +121,6 @@ commands.register('newNodeRequested', function(canvas, params) {
                 wlxmlNode = selectionStart.element.data('wlxmlNode').parent();
                 caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start';
 
-                // var wrapper = wlxmlNode.wrapText({
-                //     _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}},
-                //     offsetStart: selectionStart.offset,
-                //     offsetEnd: selectionEnd.offset,
-                //     textNodeIdx: [wlxmlNode.indexOf(selectionStart.element.data('wlxmlNode')), wlxmlNode.indexOf(selectionEnd.element.data('wlxmlNode'))] //parent.childIndex(selectionEnd.element)]
-                // }),
                 wrapper = wlxmlNode.wrapText({
                     _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}},
                     offsetStart: selectionStart.offset,
@@ -152,22 +136,16 @@ commands.register('newNodeRequested', function(canvas, params) {
                 siblingParents = canvas.wlxmlDocument.getSiblingParents({node1: node1, node2: node2});
 
             if(siblingParents) {
-                // canvas.wlxmlDocument.wrapNodes({
-                //     element1: siblingParents.node1,
-                //     element2: siblingParents.node2,
-                //     _with: {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}}
-                // });
                 canvas.wlxmlDocument.wrapNodes({
                     node1: siblingParents.node1,
                     node2: siblingParents.node2,
-                    _with: {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}}
+                    _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}}
                 });
             }
         }
     } else if(canvas.getCurrentNodeElement()) {
         wlxmlNode = canvas.getCurrentNodeElement().data('wlxmlNode');
-            // wrapper = node.wrapWith({tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}});
-        wrapper = wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}});
+        wrapper = wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}});
         canvas.setCurrentElement(utils.findCanvasElement(wrapper));
     }
 
@@ -202,7 +180,6 @@ commands.register('take-away-node', function(canvas) {
         return;
     }
 
-
     var range = nodeElement.data('wlxmlNode').unwrapContent();
 
     if(element) {