X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/5c9d3612ac44a2da2624a911c97a4aa563679fed..95d7d373a581746ce68ada33dd890ecc385245ed:/src/editor/modules/documentCanvas/commands.js diff --git a/src/editor/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js index b38c720..55de02c 100644 --- a/src/editor/modules/documentCanvas/commands.js +++ b/src/editor/modules/documentCanvas/commands.js @@ -1,9 +1,11 @@ define([ -'modules/documentCanvas/canvas/documentElement', -'./canvas/utils' -], function(documentElement, utils) { +'./canvas/utils', +'views/dialog/dialog', +'fnpjs/datetime' +], function(utils, Dialog, datetime) { 'use strict'; +/* globals gettext */ var gridToggled = false; @@ -14,8 +16,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); } }; @@ -32,7 +34,7 @@ commands.register('redo', function(canvas) { }); commands.register('remove-node', function(canvas) { - canvas.getCurrentNodeElement().data('wlxmlNode').transform('smartxml.detach'); + canvas.getCurrentNodeElement().data('wlxmlNode').detach(); }); commands.register('unwrap-node', function(canvas) { @@ -47,11 +49,7 @@ 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'), @@ -73,9 +71,7 @@ commands.register('wrap-node', function(canvas) { 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}); } }); @@ -98,53 +94,108 @@ 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}); }); 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; + wlxmlNode, caretTo, wrapperCanvasElement; + + var insertNode = function(insertion, callback) { + var doc = canvas.wlxmlDocument, + node, metadata, creator, dialog; + + var execCallback = function(node) { + if(callback) { + callback(node); + } + }; + + if(params.wlxmlTag === 'aside' && params.wlxmlClass === 'comment') { + doc.startTransaction(); + node = insertion(); + 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(); + execCallback(node); + } else if(params.wlxmlClass === 'link') { + dialog = Dialog.create({ + title: gettext('Create link'), + executeButtonText: gettext('Apply'), + cancelButtonText: gettext('Cancel'), + fields: [ + {label: gettext('Link'), name: 'href', type: 'input'} + ] + }); + dialog.on('execute', function(event) { + doc.startTransaction(); + node = insertion(); + node.setAttr('href', event.formData.href); + doc.endTransaction(); + event.success(); + execCallback(node); + }); + dialog.show(); + } else { + doc.startTransaction(); + node = insertion(); + doc.endTransaction(); + execCallback(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}); - wrapperCanvasElement = utils.findCanvasElement(wrapper); - canvas.setCurrentElement(wrapperCanvasElement.children()[0], {caretTo: caretTo}); + + insertNode( + function() { + return wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset}); + }, + function(wrapper) { + wrapperCanvasElement = utils.findCanvasElement(wrapper); + canvas.setCurrentElement(wrapperCanvasElement.children()[0], {caretTo: caretTo}); + } + ); } else { 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.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)] - }); - wrapperCanvasElement = utils.findCanvasElement(wrapper); - canvas.setCurrentElement(wrapperCanvasElement.children()[caretTo === 0 ? 0 : wrapperCanvasElement.children().length - 1], {caretTo: caretTo}); + 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)] + }); + }, + function(wrapper) { + wrapperCanvasElement = utils.findCanvasElement(wrapper); + canvas.setCurrentElement(wrapperCanvasElement.children()[caretTo === 0 ? 0 : wrapperCanvasElement.children().length - 1], {caretTo: caretTo}); + } + ); } } else { var node1 = selectionStart.element.data('wlxmlNode'), @@ -152,42 +203,85 @@ 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.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()) { wlxmlNode = canvas.getCurrentNodeElement().data('wlxmlNode'); - // wrapper = node.wrapWith({tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}}); - wrapper = wlxmlNode.transform('smartxml.wrapWith', {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}}); - canvas.setCurrentElement(utils.findCanvasElement(wrapper)); - } + var linkFound = [wlxmlNode].concat(wlxmlNode.parents()).some(function(node) { + if(node.getClass() === 'link') { + var dialog = Dialog.create({ + title: gettext('Edit link'), + executeButtonText: gettext('Apply'), + cancelButtonText: gettext('Cancel'), + fields: [ + {label: gettext('Link'), name: 'href', type: 'input', initialValue: node.getAttr('href')}, + ] + }); + dialog.on('execute', function(event) { + canvas.wlxmlDocument.startTransaction(); + node.setAttr('href', event.formData.href); + event.success(); + canvas.wlxmlDocument.endTransaction(); + }); + dialog.show(); + return true; + } + }); + if(linkFound) { + return; + } + if(params.ctrlKey) { + insertNode( + function() { + return wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}}); + }, + function(wrapper) { + canvas.setCurrentElement(utils.findCanvasElement(wrapper)); + } + ); + } else { + insertNode( + function() { + var node = wlxmlNode.after({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}}); + node.append({text:''}); + return node; + }, function(wrapper) { + 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); }); @@ -201,7 +295,6 @@ commands.register('take-away-node', function(canvas) { return; } - var range = nodeElement.data('wlxmlNode').unwrapContent(); if(element) { @@ -210,21 +303,21 @@ commands.register('take-away-node', function(canvas) { 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); } };