X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/78f57106d86fd31156033dce3d4fa9d8df5361fa..5f121e33df901aa33a79b2896e79759da6411948:/src/editor/modules/documentCanvas/commands.js

diff --git a/src/editor/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js
index 5f3583e..85831d8 100644
--- a/src/editor/modules/documentCanvas/commands.js
+++ b/src/editor/modules/documentCanvas/commands.js
@@ -82,20 +82,31 @@ commands.register('list', function(canvas, params) {
         selectionStart = cursor.getSelectionStart(),
         selectionEnd = cursor.getSelectionEnd(),
         parent1 = selectionStart.element.parent() || undefined,
-        parent2 = selectionEnd.element.parent() || undefined;
-
-    var selectionFocus = cursor.getSelectionFocus();
-
-    if(selectionStart.element.isInsideList() || selectionEnd.element.isInsideList()) {
-        return;
-    }
-
-    var node1 = parent1.wlxmlNode,
+        parent2 = selectionEnd.element.parent() || undefined,
+        selectionFocus = cursor.getSelectionFocus(),
+        node1 = parent1.wlxmlNode,
         node2 = parent2.wlxmlNode,
         doc = node1.document;
     
-    doc.createList({node1: node1, node2: node2});
-    canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
+    if(cursor.isSelecting()) {
+        doc.transaction(function() {
+            doc.createList({node1: node1, node2: node2, klass: params.meta === 'num' ? 'list.enum' : 'list'});
+        }, {
+            success: function() {
+                canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
+            }
+        });
+    } else {
+        var list;
+        if(node1.isInside('list')) {
+            list = node1.getParent('list');
+            if((params.meta === 'num' && list.getClass() === 'list.enum') || params.meta !== 'num' && list.getClass() === 'list') {
+                list.object.extractAllItems();
+            } else {
+                list.setClass(params.meta === 'num' ? 'list.enum' : 'list');
+            }
+        }
+    }
 });
 
 commands.register('toggle-grid', function(canvas, params) {
@@ -111,7 +122,7 @@ commands.register('newNodeRequested', function(canvas, params, user) {
 
     var insertNode = function(insertion, callback) {
         var doc = canvas.wlxmlDocument,
-            node, metadata, creator, dialog;
+            metadata, creator, dialog;
 
         var execCallback = function(node) {
             if(callback) {
@@ -121,7 +132,7 @@ commands.register('newNodeRequested', function(canvas, params, user) {
 
         if(params.wlxmlTag === 'aside' && params.wlxmlClass === 'comment') {
             doc.transaction(function() {
-                node = insertion();
+                var node = insertion();
                 if(user) {
                     creator = user.name;
                     if(user.email) {
@@ -134,8 +145,10 @@ commands.register('newNodeRequested', function(canvas, params, user) {
                 metadata = node.getMetadata();
                 metadata.add({key: 'creator', value: creator});
                 metadata.add({key: 'date', value: datetime.currentStrfmt()});
+                return node;
+            }, {
+                success: execCallback
             });
-            execCallback(node);
         } else if(params.wlxmlClass === 'link') {
             dialog = Dialog.create({
                 title: gettext('Create link'),
@@ -147,18 +160,19 @@ commands.register('newNodeRequested', function(canvas, params, user) {
             });
             dialog.on('execute', function(event) {
                 doc.transaction(function() {
-                    node = insertion();
+                    var node = insertion();
                     node.setAttr('href', event.formData.href);
                     event.success();
+                    return node;
+                }, {
+                    success: execCallback
                 });
-                execCallback(node);
             });
             dialog.show();
         } else {
             doc.transaction(function() {
-                node = insertion();
-            });
-            execCallback(node);
+                return insertion();
+            }, {success: execCallback});
         }
     };
 
@@ -232,7 +246,6 @@ commands.register('newNodeRequested', function(canvas, params, user) {
                         node.setAttr('href', event.formData.href);
                         event.success();
                     });
-                    canvas.wlxmlDocument.endTransaction();
                 });
                 dialog.show();
                 return true;