wlxml: metadata - additional iterator, filtering

[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 df21cff..2bd77c0 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) {
 });
 
 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) {
 });
 
 commands.register('unwrap-node', function(canvas) {


@@ -55,11 +47,7 @@ commands.register('unwrap-node', function(canvas) {
         node2 = parent2.data('wlxmlNode'),
         doc = node1.document;
     if(doc.areItemsOfSameList({node1: node1, node2: node2})) {
         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'),
         canvas.setCurrentElement(selectionAnchor.element, {caretTo: selectionAnchor.offset});
     } else if(!cursor.isSelecting()) {
         var nodeToUnwrap = cursor.getPosition().element.data('wlxmlNode'),


@@ -81,13 +69,13 @@ commands.register('wrap-node', function(canvas) {
         node2 = parent2.data('wlxmlNode'),
         doc = node1.document;
 
         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});

     }
 });
 
 commands.register('list', function(canvas, params) {
     }
 });
 
 commands.register('list', function(canvas, params) {

+    void(params);

     var cursor = canvas.getCursor(),
         selectionStart = cursor.getSelectionStart(),
         selectionEnd = cursor.getSelectionEnd(),
     var cursor = canvas.getCursor(),
         selectionStart = cursor.getSelectionStart(),
         selectionEnd = cursor.getSelectionEnd(),


@@ -104,8 +92,7 @@ commands.register('list', function(canvas, params) {
         node2 = parent2.data('wlxmlNode'),
         doc = node1.document;
     
         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});
 });
 
     canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
 });
 


@@ -117,35 +104,29 @@ commands.register('toggle-grid', function(canvas, params) {
 commands.register('newNodeRequested', function(canvas, params) {
     var cursor = canvas.getCursor(),
         selectionStart = cursor.getSelectionStart(),
 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()) {
 
     if(cursor.isSelecting()) {
         if(cursor.isSelectingSiblings()) {
             if(cursor.isSelectingWithinElement()) {

-                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}),
-                    wrapper = wlxmlNode.transform('smartxml.wrapWith', {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}, start: selectionStart.offset, end: selectionEnd.offset})
-                    ;
-                var wrapperCanvasElement = utils.findCanvasElement(wrapper);
+                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 {
                 canvas.setCurrentElement(wrapperCanvasElement.children()[0], {caretTo: caretTo});
             }
             else {

-                var 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)]
-                // }),
-                var wrapper = wlxmlNode.transform('smartxml.wrapText', {
+                wlxmlNode = selectionStart.element.data('wlxmlNode').parent();
+                caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start';
+
+                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)]
                     _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});
             }
                 wrapperCanvasElement = utils.findCanvasElement(wrapper);
                 canvas.setCurrentElement(wrapperCanvasElement.children()[caretTo === 0 ? 0 : wrapperCanvasElement.children().length - 1], {caretTo: caretTo});
             }


@@ -155,22 +136,16 @@ commands.register('newNodeRequested', function(canvas, params) {
                 siblingParents = canvas.wlxmlDocument.getSiblingParents({node1: node1, node2: node2});
 
             if(siblingParents) {
                 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', {
+                canvas.wlxmlDocument.wrapNodes({

                     node1: siblingParents.node1,
                     node2: siblingParents.node2,
                     node1: siblingParents.node1,
                     node2: siblingParents.node2,

-                    _with: {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}}
+                    _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}}

                 });
             }
         }
     } else if(canvas.getCurrentNodeElement()) {
                 });
             }
         }
     } else if(canvas.getCurrentNodeElement()) {

-        var node = 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}});
+        wlxmlNode = canvas.getCurrentNodeElement().data('wlxmlNode');
+        wrapper = wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}});

         canvas.setCurrentElement(utils.findCanvasElement(wrapper));
     }
 
         canvas.setCurrentElement(utils.findCanvasElement(wrapper));
     }
 


@@ -178,18 +153,20 @@ commands.register('newNodeRequested', function(canvas, params) {
 });
 
 commands.register('footnote', function(canvas, params) {
 });
 
 commands.register('footnote', function(canvas, params) {

+    void(params);

     var cursor = canvas.getCursor(),
         position = cursor.getPosition(),
     var cursor = canvas.getCursor(),
         position = cursor.getPosition(),

-        asideElement;
+        asideNode, asideElement;

         
 
     if(cursor.isSelectingWithinElement()) {
         
 
     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 {
     } 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);
 });
     asideElement.toggle(true);
     canvas.setCurrentElement(asideElement);
 });


@@ -199,9 +176,9 @@ commands.register('take-away-node', function(canvas) {
         element = position.element,
         nodeElement = element ? element.parent() : canvas.getCurrentNodeElement();
 
         element = position.element,
         nodeElement = element ? element.parent() : canvas.getCurrentNodeElement();
 

-    if(!nodeElement || !(nodeElement.parent()))
+    if(!nodeElement || !(nodeElement.parent())) {

         return;
         return;

-
+    }

 
     var range = nodeElement.data('wlxmlNode').unwrapContent();
 
 
     var range = nodeElement.data('wlxmlNode').unwrapContent();
 


@@ -211,13 +188,13 @@ commands.register('take-away-node', function(canvas) {
             canvas.setCurrentElement(element, {caretTo: position.offset});
         } else {
             if(elementIsFirstChild) {
             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 {
             } else {

-                canvas.setCurrentElement(findCanvasElement(range.element2), {caretTo: 'end'});
+                canvas.setCurrentElement(utils.findCanvasElement(range.element2), {caretTo: 'end'});

             }
         }
     } else {
             }
         }
     } else {

-        canvas.setCurrentElement(findCanvasElement(range.element1), {caretTo: 'start'});
+        canvas.setCurrentElement(utils.findCanvasElement(range.element1), {caretTo: 'start'});

     }
 
 });
     }
 
 });