smartxml: fix invalid context setting

[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 a165132..85831d8 100644 (file)
--- a/src/editor/modules/documentCanvas/commands.js
+++ b/src/editor/modules/documentCanvas/commands.js
@@ -82,25 +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.transaction(function() {
-        doc.createList({node1: node1, node2: node2});
-    }, {
-        success: function() {
-            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) {
@@ -240,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;