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('remove-node', function(canvas) {
- var cursor = canvas.getCursor(),
- selectionStart = cursor.getSelectionStart(),
- selectionEnd = cursor.getSelectionEnd(),
- parent1 = selectionStart.element.parent() || undefined,
- parent2 = selectionEnd.element.parent() || undefined;
-
-// canvas.wlxmlDocument.transform('detach2', {node:canvas.getCurrentNodeElement().data('wlxmlNode')});
- canvas.getCurrentNodeElement().data('wlxmlNode').transform('smartxml.detach');
-
+ canvas.getCurrentNodeElement().data('wlxmlNode').detach();
});
commands.register('unwrap-node', function(canvas) {
node2 = parent2.data('wlxmlNode'),
doc = node1.document;
if(doc.areItemsOfSameList({node1: node1, node2: node2})) {
-
-
- doc.transform('extractItems', {item1: node1, item2: node2});
-
- //canvas.list.extractItems({element1: parent1, element2: parent2});
+ doc.extractItems({item1: node1, item2: node2});
canvas.setCurrentElement(selectionAnchor.element, {caretTo: selectionAnchor.offset});
} else if(!cursor.isSelecting()) {
var nodeToUnwrap = cursor.getPosition().element.data('wlxmlNode'),
node2 = parent2.data('wlxmlNode'),
doc = node1.document;
- if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
- //canvas.list.create({element1: parent1, element2: parent2});
- doc.transform('createList', {node1: node1, node2: node2});
+ if(doc.areItemsOfSameList({node1: node1, node2: node2})) {
+ doc.createList({node1: node1, node2: node2});
}
});
commands.register('list', function(canvas, params) {
+ void(params);
var cursor = canvas.getCursor(),
selectionStart = cursor.getSelectionStart(),
selectionEnd = cursor.getSelectionEnd(),
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});
});
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();
+ 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()) {
- var 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})
- ;
- var wrapperCanvasElement = utils.findCanvasElement(wrapper);
+ wlxmlNode = selectionStart.element.data('wlxmlNode');
+ caretTo = selectionStart.offset < selectionEnd.offset ? 'start' : 'end';
+
+ 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});
}
else {
- var 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)]
- // }),
- var wrapper = wlxmlNode.transform('smartxml.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)]
- }),
+ wlxmlNode = selectionStart.element.data('wlxmlNode').parent();
+ caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start';
+
+ 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({
- // element1: siblingParents.node1,
- // element2: siblingParents.node2,
- // _with: {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}}
- // });
- canvas.wlxmlDocument.transform('smartxml.wrapNodes', {
- node1: siblingParents.node1,
- node2: siblingParents.node2,
- _with: {tagName: params.wlxmlTag, attrs: {klass: 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()) {
- var node = canvas.getCurrentNodeElement().data('wlxmlNode'),
- // wrapper = node.wrapWith({tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}});
- wrapper = node.transform('smartxml.wrapWith', {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}});
+ wlxmlNode = canvas.getCurrentNodeElement().data('wlxmlNode');
+ 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));
}
});
commands.register('footnote', function(canvas, params) {
+ void(params);
var cursor = canvas.getCursor(),
position = cursor.getPosition(),
- asideElement;
+ asideNode, asideElement, node;
if(cursor.isSelectingWithinElement()) {
- asideElement = position.element.wrapWithNodeElement({tag: 'aside', klass: 'footnote', start: cursor.getSelectionStart().offset, end: cursor.getSelectionEnd().offset});
+ asideNode = position.element.data('wlxmlNode').wrapWith({tagName: 'aside', attrs:{'class': 'footnote'}, start: cursor.getSelectionStart().offset, end: cursor.getSelectionEnd().offset});
} else {
- asideElement = position.element.divide({tag: 'aside', klass: 'footnote', offset: position.offset});
- asideElement.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);
asideElement.toggle(true);
canvas.setCurrentElement(asideElement);
});
element = position.element,
nodeElement = element ? element.parent() : canvas.getCurrentNodeElement();
- if(!nodeElement || !(nodeElement.parent()))
+ if(!nodeElement || !(nodeElement.parent())) {
return;
-
+ }
var range = nodeElement.data('wlxmlNode').unwrapContent();
canvas.setCurrentElement(element, {caretTo: position.offset});
} else {
if(elementIsFirstChild) {
- canvas.setCurrentElement(findCanvasElement(range.element1), {caretTo: 'end'});
+ canvas.setCurrentElement(utils.findCanvasElement(range.element1), {caretTo: 'end'});
} else {
- canvas.setCurrentElement(findCanvasElement(range.element2), {caretTo: 'end'});
+ canvas.setCurrentElement(utils.findCanvasElement(range.element2), {caretTo: 'end'});
}
}
} else {
- canvas.setCurrentElement(findCanvasElement(range.element1), {caretTo: 'start'});
+ canvas.setCurrentElement(utils.findCanvasElement(range.element1), {caretTo: 'start'});
}
});
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);
}
};
fnp / fnpeditor.git / blobdiff