X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/22e9258db6c11e6e0b042e142836cdb21399cc7b..e0b4f012ea85b4b1bc58f2b8531cef068bf572df:/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 6335e0a..8a26ecc 100644 --- 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; - 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) { @@ -111,7 +116,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) { @@ -120,22 +125,24 @@ commands.register('newNodeRequested', function(canvas, params, user) { }; if(params.wlxmlTag === 'aside' && params.wlxmlClass === 'comment') { - doc.startTransaction(); - node = insertion(); - if(user) { - creator = user.name; - if(user.email) { - creator += ' (' + user.email + ')'; + doc.transaction(function() { + var node = insertion(); + if(user) { + creator = user.name; + if(user.email) { + creator += ' (' + user.email + ')'; + } + } else { + creator = 'anonymous'; } - } else { - creator = 'anonymous'; - } - metadata = node.getMetadata(); - metadata.add({key: 'creator', value: creator}); - metadata.add({key: 'date', value: datetime.currentStrfmt()}); - doc.endTransaction(); - execCallback(node); + metadata = node.getMetadata(); + metadata.add({key: 'creator', value: creator}); + metadata.add({key: 'date', value: datetime.currentStrfmt()}); + return node; + }, { + success: execCallback + }); } else if(params.wlxmlClass === 'link') { dialog = Dialog.create({ title: gettext('Create link'), @@ -146,19 +153,20 @@ commands.register('newNodeRequested', function(canvas, params, user) { ] }); dialog.on('execute', function(event) { - doc.startTransaction(); - node = insertion(); - node.setAttr('href', event.formData.href); - doc.endTransaction(); - event.success(); - execCallback(node); + doc.transaction(function() { + var node = insertion(); + node.setAttr('href', event.formData.href); + event.success(); + return node; + }, { + success: execCallback + }); }); dialog.show(); } else { - doc.startTransaction(); - node = insertion(); - doc.endTransaction(); - execCallback(node); + doc.transaction(function() { + return insertion(); + }, {success: execCallback}); } }; @@ -228,9 +236,10 @@ commands.register('newNodeRequested', function(canvas, params, user) { ] }); dialog.on('execute', function(event) { - canvas.wlxmlDocument.startTransaction(); - node.setAttr('href', event.formData.href); - event.success(); + canvas.wlxmlDocument.transaction(function() { + node.setAttr('href', event.formData.href); + event.success(); + }); canvas.wlxmlDocument.endTransaction(); }); dialog.show();