smartxml: fix - removing source of the merged text if necessary

[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 7987a79..284c613 100644 (file)
--- a/src/editor/modules/documentCanvas/commands.js
+++ b/src/editor/modules/documentCanvas/commands.js
@@ -14,8 +14,8 @@ var commands = {
         this._cmds[name] = command;
     },
 
-    run: function(name, params, canvas) {
-        return this._cmds[name](canvas, params);
+    run: function(name, params, canvas, user) {
+        return this._cmds[name](canvas, params, user);
     }
 };
 
@@ -47,11 +47,7 @@ commands.register('unwrap-node', function(canvas) {
         node2 = parent2.data('wlxmlNode'),
         doc = node1.document;
     if(doc.areItemsOfSameList({node1: node1, node2: node2})) {
-
-
         doc.extractItems({item1: node1, item2: node2});
-
-        //canvas.list.extractItems({element1: parent1, element2: parent2});
         canvas.setCurrentElement(selectionAnchor.element, {caretTo: selectionAnchor.offset});
     } else if(!cursor.isSelecting()) {
         var nodeToUnwrap = cursor.getPosition().element.data('wlxmlNode'),
@@ -74,8 +70,6 @@ commands.register('wrap-node', function(canvas) {
         doc = node1.document;
 
     if(doc.areItemsOfSameList({node1: node1, node2: node2})) {
-        //canvas.list.create({element1: parent1, element2: parent2});
-        //doc.transform('createList', {node1: node1, node2: node2});
         doc.createList({node1: node1, node2: node2});
     }
 });
@@ -98,10 +92,7 @@ commands.register('list', function(canvas, params) {
         node2 = parent2.data('wlxmlNode'),
         doc = node1.document;
     
-    //doc.transform('createList', {node1: node1, node2: node2});
     doc.createList({node1: node1, node2: node2});
-
-
     canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
 });
 
@@ -110,20 +101,61 @@ commands.register('toggle-grid', function(canvas, params) {
     gridToggled = params.toggle;
 });
 
-commands.register('newNodeRequested', function(canvas, params) {
+commands.register('newNodeRequested', function(canvas, params, user) {
     var cursor = canvas.getCursor(),
         selectionStart = cursor.getSelectionStart(),
         selectionEnd = cursor.getSelectionEnd(),
         wlxmlNode, caretTo, wrapper, wrapperCanvasElement;
 
+    var insertNode = function(insertion) {
+        var doc = canvas.wlxmlDocument,
+            node, metadata, creator, currentDate, dt;
+
+        var pad = function(number) {
+            if(number < 10) {
+                number = '0' + number;
+            }
+            return number;
+        };
+
+        doc.startTransaction();
+        node = insertion();
+        if(node.getTagName() === 'aside' && node.getClass() === 'comment') {
+            if(user) {
+                creator = user.name;
+                if(user.email) {
+                    creator += ' (' + user.email + ')';
+                }
+            } else {
+                creator = 'anonymous';
+            }
+
+            currentDate = new Date();
+            dt = pad(currentDate.getDate()) + '-' +
+                            pad((currentDate.getMonth() + 1))  + '-' +
+                            pad(currentDate.getFullYear()) + ' ' +
+                            pad(currentDate.getHours()) + ':' +
+                            pad(currentDate.getMinutes()) + ':' +
+                            pad(currentDate.getSeconds());
+
+            metadata = node.getMetadata();
+            metadata.add({key: 'creator', value: creator});
+            metadata.add({key: 'date', value: dt});
+        }
+        doc.endTransaction();
+        return node;
+    };
+
+
     if(cursor.isSelecting()) {
         if(cursor.isSelectingSiblings()) {
             if(cursor.isSelectingWithinElement()) {
                 wlxmlNode = selectionStart.element.data('wlxmlNode');
                 caretTo = selectionStart.offset < selectionEnd.offset ? 'start' : 'end';
-                    //wrapper = wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset}),
-                    //wrapper = wlxmlNode.transform('smartxml.wrapWith', {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset})
-                wrapper = wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset});
+
+                wrapper = insertNode(function() {
+                    return wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset});
+                });
                 wrapperCanvasElement = utils.findCanvasElement(wrapper);
                 canvas.setCurrentElement(wrapperCanvasElement.children()[0], {caretTo: caretTo});
             }
@@ -131,17 +163,13 @@ commands.register('newNodeRequested', function(canvas, params) {
                 wlxmlNode = selectionStart.element.data('wlxmlNode').parent();
                 caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start';
 
-                // var wrapper = wlxmlNode.wrapText({
-                //     _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)]
-                // }),
-                wrapper = wlxmlNode.wrapText({
-                    _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)]
+                wrapper = insertNode(function() {
+                    return wlxmlNode.wrapText({
+                        _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)]
+                    });
                 });
                 wrapperCanvasElement = utils.findCanvasElement(wrapper);
                 canvas.setCurrentElement(wrapperCanvasElement.children()[caretTo === 0 ? 0 : wrapperCanvasElement.children().length - 1], {caretTo: caretTo});
@@ -152,22 +180,28 @@ commands.register('newNodeRequested', function(canvas, params) {
                 siblingParents = canvas.wlxmlDocument.getSiblingParents({node1: node1, node2: node2});
 
             if(siblingParents) {
-                // canvas.wlxmlDocument.wrapNodes({
-                //     element1: siblingParents.node1,
-                //     element2: siblingParents.node2,
-                //     _with: {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}}
-                // });
-                canvas.wlxmlDocument.wrapNodes({
-                    node1: siblingParents.node1,
-                    node2: siblingParents.node2,
-                    _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}}
+                insertNode(function() {
+                    return canvas.wlxmlDocument.wrapNodes({
+                        node1: siblingParents.node1,
+                        node2: siblingParents.node2,
+                        _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}}
+                    });
                 });
             }
         }
     } else if(canvas.getCurrentNodeElement()) {
         wlxmlNode = canvas.getCurrentNodeElement().data('wlxmlNode');
-            // wrapper = node.wrapWith({tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}});
-        wrapper = wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}});
+        if(params.ctrlKey) {
+            wrapper = insertNode(function() {
+                return wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}});
+            });
+        } else {
+            wrapper = insertNode(function() {
+                var node = wlxmlNode.after({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}});
+                node.append({text:''});
+                return node;
+            });
+        }
         canvas.setCurrentElement(utils.findCanvasElement(wrapper));
     }
 
@@ -202,7 +236,6 @@ commands.register('take-away-node', function(canvas) {
         return;
     }
 
-
     var range = nodeElement.data('wlxmlNode').unwrapContent();
 
     if(element) {
@@ -224,8 +257,8 @@ commands.register('take-away-node', function(canvas) {
 
 
 return {
-    run: function(name, params, canvas) {
-        return commands.run(name, params, canvas);
+    run: function(name, params, canvas, user) {
+        return commands.run(name, params, canvas, user);
     }
 };