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 19c052c..2bd77c0 100644 (file)
--- a/src/editor/modules/documentCanvas/commands.js
+++ b/src/editor/modules/documentCanvas/commands.js
@@ -32,7 +32,7 @@ commands.register('redo', function(canvas) {
 });
 
 commands.register('remove-node', function(canvas) {
 });
 
 commands.register('remove-node', function(canvas) {

-    canvas.getCurrentNodeElement().data('wlxmlNode').transform('smartxml.detach');
+    canvas.getCurrentNodeElement().data('wlxmlNode').detach();

 });
 
 commands.register('unwrap-node', function(canvas) {
 });
 
 commands.register('unwrap-node', function(canvas) {


@@ -47,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'),


@@ -73,9 +69,7 @@ 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});
     }
 });
         doc.createList({node1: node1, node2: node2});
     }
 });


@@ -98,10 +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});
     doc.createList({node1: node1, node2: node2});

-
-

     canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
 });
 
     canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
 });
 


@@ -121,8 +112,7 @@ commands.register('newNodeRequested', function(canvas, params) {
             if(cursor.isSelectingWithinElement()) {
                 wlxmlNode = selectionStart.element.data('wlxmlNode');
                 caretTo = selectionStart.offset < selectionEnd.offset ? 'start' : 'end';
             if(cursor.isSelectingWithinElement()) {
                 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});
                 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});


@@ -131,13 +121,7 @@ commands.register('newNodeRequested', function(canvas, params) {
                 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}},
-                //     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.transform('smartxml.wrapText', {
+                wrapper = wlxmlNode.wrapText({

                     _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}},
                     offsetStart: selectionStart.offset,
                     offsetEnd: selectionEnd.offset,
                     _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}},
                     offsetStart: selectionStart.offset,
                     offsetEnd: selectionEnd.offset,


@@ -152,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()) {
         wlxmlNode = canvas.getCurrentNodeElement().data('wlxmlNode');
                 });
             }
         }
     } else if(canvas.getCurrentNodeElement()) {
         wlxmlNode = canvas.getCurrentNodeElement().data('wlxmlNode');

-            // wrapper = node.wrapWith({tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}});
-        wrapper = wlxmlNode.transform('smartxml.wrapWith', {tagName: params.wlxmlTag, attrs: {klass: params.wlxmlClass}});
+        wrapper = wlxmlNode.wrapWith({tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}});

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


@@ -178,16 +156,17 @@ commands.register('footnote', function(canvas, params) {
     void(params);
     var cursor = canvas.getCursor(),
         position = cursor.getPosition(),
     void(params);
     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);
 });


@@ -201,7 +180,6 @@ commands.register('take-away-node', function(canvas) {
         return;
     }
 
         return;
     }
 

-

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