editor: remove new line characters from pasted text

[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 8bd05a5..ae1cee1 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
+++ b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
@@ -39,11 +39,16 @@ var handlers = {
     nodeTagChange: function(event) {
         var canvasNode = utils.findCanvasElement(event.meta.node);
         canvasNode.setWlxmlTag(event.meta.newTagName);
+        canvasNode.data('wlxmlNode', event.meta.node);
     },
-    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;
@@ -53,18 +58,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) {
-        var canvasElement = utils.findCanvasElement(event.meta.node);
-        canvasElement.setText(event.meta.node.getText());
+        //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;
+        }
+        if(toSet !== canvasElement.getText()) {
+            canvasElement.setText(toSet);
+        }
     }
 };