define([
-'modules/documentCanvas/canvas/documentElement',
-'./canvas/utils'
-], function(documentElement, utils) {
+'./canvas/utils',
+'fnpjs/datetime'
+], function(utils, datetime) {
'use strict';
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);
}
};
});
commands.register('toggle-grid', function(canvas, params) {
- canvas.doc().dom().find('[wlxml-tag]').toggleClass('rng-common-hoveredNode', params.toggle);
+ canvas.doc().dom().parent().toggleClass('grid-on', params.toggle);
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;
+
+ 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';
+ }
+
+ metadata = node.getMetadata();
+ metadata.add({key: 'creator', value: creator});
+ metadata.add({key: 'date', value: datetime.currentStrfmt()});
+ }
+ 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 = 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});
}
wlxmlNode = selectionStart.element.data('wlxmlNode').parent();
caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start';
- 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});
siblingParents = canvas.wlxmlDocument.getSiblingParents({node1: node1, node2: node2});
if(siblingParents) {
- 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 = 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));
}
void(params);
var cursor = canvas.getCursor(),
position = cursor.getPosition(),
- asideNode, asideElement;
+ asideNode, asideElement, node;
if(cursor.isSelectingWithinElement()) {
asideNode = position.element.data('wlxmlNode').wrapWith({tagName: 'aside', attrs:{'class': 'footnote'}, start: cursor.getSelectionStart().offset, end: cursor.getSelectionEnd().offset});
} else {
- asideNode = position.element.data('wlxmlNode').divideWithElementNode({tagName: 'aside', attrs:{'class': 'footnote'}}, {offset: position.offset});
- asideNode.append({text: ''});
+ node = position.element.data('wlxmlNode');
+ node.document.transaction(function() {
+ asideNode = node.divideWithElementNode({tagName: 'aside', attrs:{'class': 'footnote'}}, {offset: position.offset});
+ asideNode.append({text: ''});
+ });
}
asideElement = utils.findCanvasElement(asideNode);
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);
}
};