pre d: setattr, settext, split as ContextTransformations; detach in old format; pre...

[fnpeditor.git] / src / editor / modules / documentCanvas / canvas / wlxmlListener.js

diff --git a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
index 2dd61ff..ffabfec 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
+++ b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
@@ -40,14 +40,14 @@ var handlers = {
         var canvasNode = utils.findCanvasElement(event.meta.node);
         canvasNode.setWlxmlTag(event.meta.newTagName);
     },
-    nodeAdded: function(event) {
+    nodeAdded: function(event, checkForExistence) {
         if(event.meta.node.isRoot()) {
             this.canvas.reloadRoot();
             return;
         }
         var parentElement = utils.findCanvasElement(event.meta.node.parent()),
             nodeIndex = event.meta.node.getIndex(),
-            referenceElement, referenceAction;
+            referenceElement, referenceAction, actionArg;
 
         if(nodeIndex === 0) {
             referenceElement = parentElement;
@@ -57,22 +57,26 @@ var handlers = {
             referenceAction = 'after';
         }
 
-        referenceElement[referenceAction](event.meta.node);
+        actionArg = (checkForExistence && utils.findCanvasElement(event.meta.node)) || event.meta.node;
+        referenceElement[referenceAction](actionArg);
     },
     nodeMoved: function(event) {
-        return handlers.nodeAdded(event);
+        return handlers.nodeAdded(event, true);
     },
     nodeDetached: function(event) {
         var canvasNode = utils.findCanvasElementInParent(event.meta.node, event.meta.parent);
         canvasNode.detach();
     },
     nodeTextChange: function(event) {
+        console.log('wlxmlListener: ' + event.meta.node.getText());
         var canvasElement = utils.findCanvasElement(event.meta.node),
             toSet = event.meta.node.getText();
         if(toSet === '') {
             toSet = utils.unicode.ZWS;
         }
-        canvasElement.setText(toSet);
+        if(toSet !== canvasElement.getText()) {
+            canvasElement.setText(toSet);
+        }
     }
 };