cleanup

[fnpeditor.git] / src / editor / modules / documentCanvas / commands.js

diff --git a/src/editor/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js
index df21cff..3cecf60 100644 (file)
--- a/src/editor/modules/documentCanvas/commands.js
+++ b/src/editor/modules/documentCanvas/commands.js
@@ -83,7 +83,8 @@ commands.register('wrap-node', function(canvas) {
 
     if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
         //canvas.list.create({element1: parent1, element2: parent2});
 
     if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
         //canvas.list.create({element1: parent1, element2: parent2});

-        doc.transform('createList', {node1: node1, node2: node2});
+        //doc.transform('createList', {node1: node1, node2: node2});
+        doc.createList({node1: node1, node2: node2});

     }
 });
 
     }
 });
 


@@ -104,7 +105,9 @@ commands.register('list', function(canvas, params) {
         node2 = parent2.data('wlxmlNode'),
         doc = node1.document;
     
         node2 = parent2.data('wlxmlNode'),
         doc = node1.document;
     

-    doc.transform('createList', {node1: node1, node2: node2});
+    //doc.transform('createList', {node1: node1, node2: node2});
+    doc.createList({node1: node1, node2: node2});
+

 
     canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
 });
 
     canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
 });


@@ -125,7 +128,8 @@ commands.register('newNodeRequested', function(canvas, params) {
                 var 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}),
                 var 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.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});

                     ;
                 var wrapperCanvasElement = utils.findCanvasElement(wrapper);
                 canvas.setCurrentElement(wrapperCanvasElement.children()[0], {caretTo: caretTo});
                     ;
                 var wrapperCanvasElement = utils.findCanvasElement(wrapper);
                 canvas.setCurrentElement(wrapperCanvasElement.children()[0], {caretTo: caretTo});