wlxml: lists - list.extractAllItems

[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 5f3583e..8a26ecc 100644 (file)
--- a/src/editor/modules/documentCanvas/commands.js
+++ b/src/editor/modules/documentCanvas/commands.js
@@ -94,8 +94,13 @@ commands.register('list', function(canvas, params) {
         node2 = parent2.wlxmlNode,
         doc = node1.document;
     
         node2 = parent2.wlxmlNode,
         doc = node1.document;
     

-    doc.createList({node1: node1, node2: node2});
-    canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
+    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});
+        }
+    });

 });
 
 commands.register('toggle-grid', function(canvas, params) {
 });
 
 commands.register('toggle-grid', function(canvas, params) {


@@ -111,7 +116,7 @@ commands.register('newNodeRequested', function(canvas, params, user) {
 
     var insertNode = function(insertion, callback) {
         var doc = canvas.wlxmlDocument,
 
     var insertNode = function(insertion, callback) {
         var doc = canvas.wlxmlDocument,

-            node, metadata, creator, dialog;
+            metadata, creator, dialog;

 
         var execCallback = function(node) {
             if(callback) {
 
         var execCallback = function(node) {
             if(callback) {


@@ -121,7 +126,7 @@ commands.register('newNodeRequested', function(canvas, params, user) {
 
         if(params.wlxmlTag === 'aside' && params.wlxmlClass === 'comment') {
             doc.transaction(function() {
 
         if(params.wlxmlTag === 'aside' && params.wlxmlClass === 'comment') {
             doc.transaction(function() {

-                node = insertion();
+                var node = insertion();

                 if(user) {
                     creator = user.name;
                     if(user.email) {
                 if(user) {
                     creator = user.name;
                     if(user.email) {


@@ -134,8 +139,10 @@ commands.register('newNodeRequested', function(canvas, params, user) {
                 metadata = node.getMetadata();
                 metadata.add({key: 'creator', value: creator});
                 metadata.add({key: 'date', value: datetime.currentStrfmt()});
                 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'),
         } else if(params.wlxmlClass === 'link') {
             dialog = Dialog.create({
                 title: gettext('Create link'),


@@ -147,18 +154,19 @@ commands.register('newNodeRequested', function(canvas, params, user) {
             });
             dialog.on('execute', function(event) {
                 doc.transaction(function() {
             });
             dialog.on('execute', function(event) {
                 doc.transaction(function() {

-                    node = insertion();
+                    var node = insertion();

                     node.setAttr('href', event.formData.href);
                     event.success();
                     node.setAttr('href', event.formData.href);
                     event.success();

+                    return node;
+                }, {
+                    success: execCallback

                 });
                 });

-                execCallback(node);

             });
             dialog.show();
         } else {
             doc.transaction(function() {
             });
             dialog.show();
         } else {
             doc.transaction(function() {

-                node = insertion();
-            });
-            execCallback(node);
+                return insertion();
+            }, {success: execCallback});

         }
     };
 
         }
     };