canvas: Fix getting invalidated references to wlxmlNodes after node tag change

[fnpeditor.git] / src / editor / modules / documentCanvas / commands.js

diff --git a/src/editor/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js
index 8793b9c..ce49c78 100644 (file)
--- a/src/editor/modules/documentCanvas/commands.js
+++ b/src/editor/modules/documentCanvas/commands.js
@@ -32,15 +32,7 @@ commands.register('redo', function(canvas) {
 });
 
 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) {
@@ -50,12 +42,17 @@ commands.register('unwrap-node', function(canvas) {
         parent1 = selectionStart.element.parent() || undefined,
         parent2 = selectionEnd.element.parent() || undefined;
 
-    if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
-        return;
-        // TODO
-        // var selectionAnchor = cursor.getSelectionAnchor();
-        // canvas.list.extractItems({element1: parent1, element2: parent2});
-        // canvas.setCurrentElement(selectionAnchor.element, {caretTo: selectionAnchor.offset});
+    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 nodeToUnwrap = cursor.getPosition().element.data('wlxmlNode'),
             parentNode = nodeToUnwrap.unwrap();
@@ -65,19 +62,26 @@ commands.register('unwrap-node', function(canvas) {
     }
 });
 
-// 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;
+
+    var node1 = parent1.data('wlxmlNode'),
+        node2 = parent2.data('wlxmlNode'),
+        doc = node1.document;
 
-//     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});
+        //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(),
@@ -90,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});
 });
@@ -103,22 +113,23 @@ 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 wlxmlNode = selectionStart.element.data('wlxmlNode'),
-                    caretTo = selectionStart.offset < selectionEnd.offset ? 'start' : 'end',
+                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);
+                    //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 wlxmlNode = selectionStart.element.data('wlxmlNode').parent(),
-                    caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start';
+                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}},
@@ -126,12 +137,12 @@ commands.register('newNodeRequested', function(canvas, params) {
                 //     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', {
+                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)]
-                }),
+                });
                 wrapperCanvasElement = utils.findCanvasElement(wrapper);
                 canvas.setCurrentElement(wrapperCanvasElement.children()[caretTo === 0 ? 0 : wrapperCanvasElement.children().length - 1], {caretTo: caretTo});
             }
@@ -146,7 +157,7 @@ commands.register('newNodeRequested', function(canvas, params) {
                 //     element2: siblingParents.node2,
                 //     _with: {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}}
                 // });
-                canvas.wlxmlDocument.transform('smartxml.wrapNodes', {
+                canvas.wlxmlDocument.wrapNodes({
                     node1: siblingParents.node1,
                     node2: siblingParents.node2,
                     _with: {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}}
@@ -154,9 +165,9 @@ commands.register('newNodeRequested', function(canvas, params) {
             }
         }
     } else if(canvas.getCurrentNodeElement()) {
-        var node = canvas.getCurrentNodeElement().data('wlxmlNode'),
+        wlxmlNode = 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}});
+        wrapper = wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}});
         canvas.setCurrentElement(utils.findCanvasElement(wrapper));
     }
 
@@ -164,18 +175,20 @@ commands.register('newNodeRequested', function(canvas, params) {
 });
 
 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);
 });
@@ -185,8 +198,9 @@ 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.data('wlxmlNode').unwrapContent();
@@ -197,13 +211,13 @@ 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'});
     }
 
 });