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 55de02c..85831d8 100644 (file)
--- a/src/editor/modules/documentCanvas/commands.js
+++ b/src/editor/modules/documentCanvas/commands.js
@@ -34,7 +34,7 @@ commands.register('redo', function(canvas) {
 });
 
 commands.register('remove-node', function(canvas) {
-    canvas.getCurrentNodeElement().data('wlxmlNode').detach();
+    canvas.getCurrentNodeElement().wlxmlNode.detach();
 });
 
 commands.register('unwrap-node', function(canvas) {
@@ -45,14 +45,14 @@ commands.register('unwrap-node', function(canvas) {
         parent2 = selectionEnd.element.parent() || undefined;
 
     var selectionAnchor = cursor.getSelectionAnchor(),
-        node1 = parent1.data('wlxmlNode'),
-        node2 = parent2.data('wlxmlNode'),
+        node1 = parent1.wlxmlNode,
+        node2 = parent2.wlxmlNode,
         doc = node1.document;
     if(doc.areItemsOfSameList({node1: node1, node2: node2})) {
         doc.extractItems({item1: node1, item2: node2});
         canvas.setCurrentElement(selectionAnchor.element, {caretTo: selectionAnchor.offset});
     } else if(!cursor.isSelecting()) {
-        var nodeToUnwrap = cursor.getPosition().element.data('wlxmlNode'),
+        var nodeToUnwrap = cursor.getPosition().element.wlxmlNode,
             parentNode = nodeToUnwrap.unwrap();
         if(parentNode) {
             canvas.setCurrentElement(utils.findCanvasElement(parentNode));
@@ -67,8 +67,8 @@ commands.register('wrap-node', function(canvas) {
         parent1 = selectionStart.element.parent() || undefined,
         parent2 = selectionEnd.element.parent() || undefined;
 
-    var node1 = parent1.data('wlxmlNode'),
-        node2 = parent2.data('wlxmlNode'),
+    var node1 = parent1.wlxmlNode,
+        node2 = parent2.wlxmlNode,
         doc = node1.document;
 
     if(doc.areItemsOfSameList({node1: node1, node2: node2})) {
@@ -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.data('wlxmlNode'),
-        node2 = parent2.data('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) {
@@ -120,22 +131,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,26 +159,27 @@ 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});
         }
     };
 
     if(cursor.isSelecting()) {
         if(cursor.isSelectingSiblings()) {
             if(cursor.isSelectingWithinElement()) {
-                wlxmlNode = selectionStart.element.data('wlxmlNode');
+                wlxmlNode = selectionStart.element.wlxmlNode;
                 caretTo = selectionStart.offset < selectionEnd.offset ? 'start' : 'end';
 
                 insertNode(
@@ -179,7 +193,7 @@ commands.register('newNodeRequested', function(canvas, params, user) {
                 );
             }
             else {
-                wlxmlNode = selectionStart.element.data('wlxmlNode').parent();
+                wlxmlNode = selectionStart.element.wlxmlNode.parent();
                 caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start';
 
                 insertNode(
@@ -188,7 +202,7 @@ commands.register('newNodeRequested', function(canvas, params, user) {
                             _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}},
                             offsetStart: selectionStart.offset,
                             offsetEnd: selectionEnd.offset,
-                            textNodeIdx: [wlxmlNode.indexOf(selectionStart.element.data('wlxmlNode')), wlxmlNode.indexOf(selectionEnd.element.data('wlxmlNode'))] //parent.childIndex(selectionEnd.element)]
+                            textNodeIdx: [wlxmlNode.indexOf(selectionStart.element.wlxmlNode), wlxmlNode.indexOf(selectionEnd.element.wlxmlNode)] //parent.childIndex(selectionEnd.element)]
                         });
                     },
                     function(wrapper) {
@@ -198,8 +212,8 @@ commands.register('newNodeRequested', function(canvas, params, user) {
                 );
             }
         } else {
-            var node1 = selectionStart.element.data('wlxmlNode'),
-                node2 = selectionEnd.element.data('wlxmlNode'),
+            var node1 = selectionStart.element.wlxmlNode,
+                node2 = selectionEnd.element.wlxmlNode,
                 siblingParents = canvas.wlxmlDocument.getSiblingParents({node1: node1, node2: node2});
 
             if(siblingParents) {
@@ -215,7 +229,7 @@ commands.register('newNodeRequested', function(canvas, params, user) {
             }
         }
     } else if(canvas.getCurrentNodeElement()) {
-        wlxmlNode = canvas.getCurrentNodeElement().data('wlxmlNode');
+        wlxmlNode = canvas.getCurrentNodeElement().wlxmlNode;
 
         var linkFound = [wlxmlNode].concat(wlxmlNode.parents()).some(function(node) {
             if(node.getClass() === 'link') {
@@ -228,10 +242,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.endTransaction();
+                    canvas.wlxmlDocument.transaction(function() {
+                        node.setAttr('href', event.formData.href);
+                        event.success();
+                    });
                 });
                 dialog.show();
                 return true;
@@ -272,9 +286,9 @@ commands.register('footnote', function(canvas, params) {
         
 
     if(cursor.isSelectingWithinElement()) {
-        asideNode = position.element.data('wlxmlNode').wrapWith({tagName: 'aside', attrs:{'class': 'footnote'}, start: cursor.getSelectionStart().offset, end: cursor.getSelectionEnd().offset});
+        asideNode = position.element.wlxmlNode.wrapWith({tagName: 'aside', attrs:{'class': 'footnote'}, start: cursor.getSelectionStart().offset, end: cursor.getSelectionEnd().offset});
     } else {
-        node = position.element.data('wlxmlNode');
+        node = position.element.wlxmlNode;
         node.document.transaction(function() {
             asideNode = node.divideWithElementNode({tagName: 'aside', attrs:{'class': 'footnote'}}, {offset: position.offset});
             asideNode.append({text: ''});
@@ -295,7 +309,7 @@ commands.register('take-away-node', function(canvas) {
         return;
     }
 
-    var range = nodeElement.data('wlxmlNode').unwrapContent();
+    var range = nodeElement.wlxmlNode.unwrapContent();
 
     if(element) {
         var elementIsFirstChild = nodeElement.childIndex(element);