X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/efe36f4f1b5df351eeb4d40a54c3900cf9a7079b..30363302f46e0ed1f6a4c214b2e04d7c8e12ae73:/src/editor/modules/documentCanvas/commands.js?ds=inline

diff --git a/src/editor/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js
index 043d6b7..ac56a31 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';
 
@@ -26,27 +27,31 @@ commands.register('unwrap-node', function(canvas) {
         parent2 = selectionEnd.element.parent() || undefined;
 
     if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
-        var selectionAnchor = cursor.getSelectionAnchor();
-        canvas.list.extractItems({element1: parent1, element2: parent2});
-        canvas.setCurrentElement(selectionAnchor.element, {caretTo: selectionAnchor.offset});
+        return;
+        // TODO
+        // var selectionAnchor = cursor.getSelectionAnchor();
+        // 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));
+        }
     }
 });
 
-commands.register('wrap-node', function(canvas) {
-    var cursor = canvas.getCursor(),
-        selectionStart = cursor.getSelectionStart(),
-        selectionEnd = cursor.getSelectionEnd(),
-        parent1 = selectionStart.element.parent() || undefined,
-        parent2 = selectionEnd.element.parent() || undefined;
+// commands.register('wrap-node', function(canvas) {
+//     var cursor = canvas.getCursor(),
+//         selectionStart = cursor.getSelectionStart(),
+//         selectionEnd = cursor.getSelectionEnd(),
+//         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});
-    }
-});
+//     if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
+//         canvas.list.create({element1: parent1, element2: parent2});
+//     }
+// });
 
 commands.register('list', function(canvas, params) {
     var cursor = canvas.getCursor(),
@@ -79,37 +84,42 @@ commands.register('newNodeRequested', function(canvas, params) {
     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});
+                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}),
+                    wrapperCanvasElement = utils.findCanvasElement(wrapper);
+                canvas.setCurrentElement(wrapperCanvasElement.children()[0], {caretTo: caretTo});
             }
             else {
-                var parent = selectionStart.element.parent(),
+                var wlxmlNode = selectionStart.element.data('wlxmlNode').parent(),
                     caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start';
 
-                var wrapper = canvas.wrapText({
-                    inside: parent,
-                    _with: {tag: params.wlxmlTag, klass: params.wlxmlClass},
+                var 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)]
-                });
-
-                canvas.setCurrentElement(wrapper.children()[caretTo === 0 ? 0 : wrapper.children().length - 1], {caretTo: caretTo});
+                    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});
             }
         } 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}}
                 });
             }
         }
     } else if(canvas.getCurrentNodeElement()) {
-        var el = canvas.getCurrentNodeElement().wrapWithNodeElement({tag: params.wlxmlTag, klass: params.wlxmlClass});
-        canvas.setCurrentElement(el);
+        var node = findCanvasElement(canvas.getCurrentNodeElement),
+            wrapper = node.wrapWith({tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}});
+        canvas.setCurrentElement(findCanvasElement(wrapper));
     }
 
 
@@ -141,7 +151,7 @@ commands.register('take-away-node', function(canvas) {
         return;
 
 
-    var range = nodeElement.unwrapContents();
+    var range = nodeElement.data('wlxmlNode').unwrapContent();
 
     if(element) {
         var elementIsFirstChild = nodeElement.childIndex(element);
@@ -149,13 +159,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(findCanvasElement(range.element1), {caretTo: 'end'});
             } else {
-                canvas.setCurrentElement(range.element2, {caretTo: 'end'});
+                canvas.setCurrentElement(findCanvasElement(range.element2), {caretTo: 'end'});
             }
         }
     } else {
-        canvas.setCurrentElement(range.element1, {caretTo: 'start'});
+        canvas.setCurrentElement(findCanvasElement(range.element1), {caretTo: 'start'});
     }
 
 });