X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/efe36f4f1b5df351eeb4d40a54c3900cf9a7079b..2bb3ace4395ece36636f8b6b8a46b974a17d4a6f:/src/editor/modules/documentCanvas/commands.js?ds=sidebyside diff --git a/src/editor/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js index 043d6b7..b4f034a 100644 --- a/src/editor/modules/documentCanvas/commands.js +++ b/src/editor/modules/documentCanvas/commands.js @@ -1,6 +1,7 @@ define([ -'modules/documentCanvas/canvas/documentElement' -], function(documentElement) { +'modules/documentCanvas/canvas/documentElement', +'./canvas/utils' +], function(documentElement, utils) { 'use strict'; @@ -18,6 +19,22 @@ var commands = { } }; +commands.register('undo', function(canvas) { + var doc = canvas.wlxmlDocument; + + doc.undo(); +}); + +commands.register('redo', function(canvas) { + var doc = canvas.wlxmlDocument; + + doc.redo(); +}); + +commands.register('remove-node', function(canvas) { + canvas.getCurrentNodeElement().data('wlxmlNode').detach(); +}); + commands.register('unwrap-node', function(canvas) { var cursor = canvas.getCursor(), selectionStart = cursor.getSelectionStart(), @@ -25,14 +42,23 @@ commands.register('unwrap-node', function(canvas) { parent1 = selectionStart.element.parent() || undefined, parent2 = selectionEnd.element.parent() || undefined; - if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) { - var selectionAnchor = cursor.getSelectionAnchor(); - canvas.list.extractItems({element1: parent1, element2: parent2}); + var selectionAnchor = cursor.getSelectionAnchor(), + node1 = parent1.data('wlxmlNode'), + 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 toUnwrap = cursor.getPosition().element, - parent = toUnwrap.unwrap(); - canvas.setCurrentElement(parent); + var nodeToUnwrap = cursor.getPosition().element.data('wlxmlNode'), + parentNode = nodeToUnwrap.unwrap(); + if(parentNode) { + canvas.setCurrentElement(utils.findCanvasElement(parentNode)); + } } }); @@ -43,12 +69,19 @@ commands.register('wrap-node', function(canvas) { parent1 = selectionStart.element.parent() || undefined, parent2 = selectionEnd.element.parent() || undefined; - if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) { - canvas.list.create({element1: parent1, element2: parent2}); + var node1 = parent1.data('wlxmlNode'), + node2 = parent2.data('wlxmlNode'), + 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}); } }); commands.register('list', function(canvas, params) { + void(params); var cursor = canvas.getCursor(), selectionStart = cursor.getSelectionStart(), selectionEnd = cursor.getSelectionEnd(), @@ -61,7 +94,13 @@ commands.register('list', function(canvas, params) { return; } - canvas.list.create({element1: parent1, element2: parent2}); + var node1 = parent1.data('wlxmlNode'), + 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}); }); @@ -74,60 +113,82 @@ commands.register('toggle-grid', function(canvas, params) { commands.register('newNodeRequested', function(canvas, params) { var cursor = canvas.getCursor(), selectionStart = cursor.getSelectionStart(), - selectionEnd = cursor.getSelectionEnd(); + selectionEnd = cursor.getSelectionEnd(), + wlxmlNode, caretTo, wrapper, wrapperCanvasElement; if(cursor.isSelecting()) { if(cursor.isSelectingSiblings()) { if(cursor.isSelectingWithinElement()) { - var newElement = selectionStart.element.wrapWithNodeElement({tag: params.wlxmlTag, klass: params.wlxmlClass, start: selectionStart.offset, end: selectionEnd.offset}), - caretTo = selectionStart.offset < selectionEnd.offset ? 'start' : 'end'; - canvas.setCurrentElement(newElement.children()[0], {caretTo: caretTo}); + 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}); } else { - var parent = selectionStart.element.parent(), - caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start'; - - var wrapper = canvas.wrapText({ - inside: parent, - _with: {tag: params.wlxmlTag, klass: params.wlxmlClass}, + 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: [parent.childIndex(selectionStart.element), parent.childIndex(selectionEnd.element)] + textNodeIdx: [wlxmlNode.indexOf(selectionStart.element.data('wlxmlNode')), wlxmlNode.indexOf(selectionEnd.element.data('wlxmlNode'))] //parent.childIndex(selectionEnd.element)] }); - - canvas.setCurrentElement(wrapper.children()[caretTo === 0 ? 0 : wrapper.children().length - 1], {caretTo: caretTo}); + wrapperCanvasElement = utils.findCanvasElement(wrapper); + canvas.setCurrentElement(wrapperCanvasElement.children()[caretTo === 0 ? 0 : wrapperCanvasElement.children().length - 1], {caretTo: caretTo}); } } else { - var siblingParents = canvas.getSiblingParents({element1: selectionStart.element, element2: selectionEnd.element}) + var node1 = selectionStart.element.data('wlxmlNode'), + node2 = selectionEnd.element.data('wlxmlNode'), + siblingParents = canvas.wlxmlDocument.getSiblingParents({node1: node1, node2: node2}); + if(siblingParents) { - canvas.wrapElements({ - element1: siblingParents.element1, - element2: siblingParents.element2, - _with: {tag: params.wlxmlTag, klass: params.wlxmlClass} + // 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: {klass: params.wlxmlClass}} }); } } } else if(canvas.getCurrentNodeElement()) { - var el = canvas.getCurrentNodeElement().wrapWithNodeElement({tag: params.wlxmlTag, klass: params.wlxmlClass}); - canvas.setCurrentElement(el); + 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}}); + canvas.setCurrentElement(utils.findCanvasElement(wrapper)); } }); commands.register('footnote', function(canvas, params) { + void(params); var cursor = canvas.getCursor(), position = cursor.getPosition(), - asideElement; + asideNode, asideElement; 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: ''}); + asideNode = position.element.data('wlxmlNode').divideWithElementNode({tagName: 'aside', attrs:{'class': 'footnote'}}, {offset: position.offset}); + asideNode.append({text: ''}); } + asideElement = utils.findCanvasElement(asideNode); asideElement.toggle(true); canvas.setCurrentElement(asideElement); }); @@ -137,11 +198,12 @@ commands.register('take-away-node', function(canvas) { element = position.element, nodeElement = element ? element.parent() : canvas.getCurrentNodeElement(); - if(!nodeElement || !(nodeElement.parent())) + if(!nodeElement || !(nodeElement.parent())) { return; + } - var range = nodeElement.unwrapContents(); + var range = nodeElement.data('wlxmlNode').unwrapContent(); if(element) { var elementIsFirstChild = nodeElement.childIndex(element); @@ -149,13 +211,13 @@ commands.register('take-away-node', function(canvas) { canvas.setCurrentElement(element, {caretTo: position.offset}); } else { if(elementIsFirstChild) { - canvas.setCurrentElement(range.element1, {caretTo: 'end'}); + canvas.setCurrentElement(utils.findCanvasElement(range.element1), {caretTo: 'end'}); } else { - canvas.setCurrentElement(range.element2, {caretTo: 'end'}); + canvas.setCurrentElement(utils.findCanvasElement(range.element2), {caretTo: 'end'}); } } } else { - canvas.setCurrentElement(range.element1, {caretTo: 'start'}); + canvas.setCurrentElement(utils.findCanvasElement(range.element1), {caretTo: 'start'}); } });