From: Aleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Tue, 19 Nov 2013 10:29:07 +0000 (+0100)
Subject: integration wip: wrap/unwrap node commands
X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/fea8fda1a2f6a07eac7bb37c3c40a053d398ef92?ds=sidebyside

integration wip: wrap/unwrap node commands

- comment out lists handling as they are not supported yet
- handle unwrapping single node
---

diff --git a/src/editor/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js
index 69dd305..1981429 100644
--- a/src/editor/modules/documentCanvas/commands.js
+++ b/src/editor/modules/documentCanvas/commands.js
@@ -27,27 +27,29 @@ 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();
+        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;
-
-    if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
-        canvas.list.create({element1: parent1, element2: parent2});
-    }
-});
+// 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});
+//     }
+// });
 
 commands.register('list', function(canvas, params) {
     var cursor = canvas.getCursor(),