From f87e25a2b4d41deadb65308b278496ad2ff995d3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Mon, 9 Dec 2013 11:06:39 +0100 Subject: [PATCH 1/1] editor: update old transform api calls to new way of calling transformations --- src/editor/modules/documentCanvas/commands.js | 19 ++++++++++--------- src/editor/modules/nodePane/nodePane.js | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/editor/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js index 19c052c..ce49c78 100644 --- 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) { - canvas.getCurrentNodeElement().data('wlxmlNode').transform('smartxml.detach'); + canvas.getCurrentNodeElement().data('wlxmlNode').detach(); }); commands.register('unwrap-node', function(canvas) { @@ -49,7 +49,7 @@ commands.register('unwrap-node', function(canvas) { if(doc.areItemsOfSameList({node1: node1, node2: node2})) { - doc.transform('extractItems', {item1: node1, item2: node2}); + doc.extractItems({item1: node1, item2: node2}); //canvas.list.extractItems({element1: parent1, element2: parent2}); canvas.setCurrentElement(selectionAnchor.element, {caretTo: selectionAnchor.offset}); @@ -137,7 +137,7 @@ 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)] // }), - wrapper = wlxmlNode.transform('smartxml.wrapText', { + wrapper = wlxmlNode.wrapText({ _with: {tagName: params.wlxmlTag, attrs: {'class': params.wlxmlClass}}, offsetStart: selectionStart.offset, offsetEnd: selectionEnd.offset, @@ -157,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}} @@ -167,7 +167,7 @@ commands.register('newNodeRequested', function(canvas, params) { } 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: {klass: params.wlxmlClass}}); canvas.setCurrentElement(utils.findCanvasElement(wrapper)); } @@ -178,16 +178,17 @@ 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); }); diff --git a/src/editor/modules/nodePane/nodePane.js b/src/editor/modules/nodePane/nodePane.js index 1ecafe1..d44c967 100644 --- a/src/editor/modules/nodePane/nodePane.js +++ b/src/editor/modules/nodePane/nodePane.js @@ -20,7 +20,7 @@ return function(sandbox) { if(attr === 'Class') { //currentNode.document.transform('setClass', {node: currentNode, klass: value}); - currentNode.transform('smartxml.setAttr', {name: 'class', value: value}); + currentNode.setClass(value); } //currentNode['set' + attr](value); }); @@ -49,7 +49,7 @@ return function(sandbox) { var widget = metaWidget.create({attrs:wlxmlNodeElement.getMetaAttributes()}); widget.on('valueChanged', function(key, value) { - wlxmlNodeElement.transform('wlxml.setMetaAttribute', {name: key, value: value}); + wlxmlNodeElement.setMetaAttribute(key, value); //wlxmlNodeElement.setMetaAttribute(key, value); }); view.find('.metaFields').empty().append(widget.el); -- 2.20.1