X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/c809e29b61d281d9584bb93f51ced02a6199802d..436728b375888873e6e96079a73f12d8adbd7b96:/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 0ae8885..bb09ec7 100644
--- a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
+++ b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
@@ -23,6 +23,10 @@ $.extend(Listener.prototype, {
             }
         }, this);
 
+        wlxmlDocument.on('operationEnd', function() {
+            this.canvas.triggerSelectionChanged();
+        }, this);
+
         wlxmlDocument.on('contentSet', function() {
             this.canvas.loadWlxmlDocument(wlxmlDocument);
         }, this);
@@ -31,59 +35,51 @@ $.extend(Listener.prototype, {
 
 
 var _metadataEventHandler = function(event) {
-    var canvasNode = utils.findCanvasElement(event.meta.node);
-    canvasNode.exec('updateMetadata');
+    var element = utils.getElementForNode(event.meta.node);
+    element.handle(event);
 };
 
+
 var handlers = {
     nodeAttrChange: function(event) {
+        var element = utils.getElementForNode(event.meta.node),
+            newElement;
         if(event.meta.attr === 'class') {
-            var canvasNode = utils.findCanvasElement(event.meta.node);
-            canvasNode.setWlxmlClass(event.meta.newVal);
+            if(element.wlxmlNode.getClass() !== event.meta.attr) {
+                if(event.meta.node.isRoot()) {
+                    this.canvas.reloadRoot();
+                } else {
+                    newElement = this.canvas.createElement(event.meta.node);
+                    element.dom.replaceWith(newElement.dom);
+                }
+            }
+
+        } else {
+            element.handle(event);
         }
     },
-    nodeTagChange: function(event) {
-        var canvasNode = utils.findCanvasElement(event.meta.node);
-        canvasNode.setWlxmlTag(event.meta.newTagName);
-        canvasNode.data('wlxmlNode', event.meta.node);
-    },
-    nodeAdded: function(event, checkForExistence) {
+    nodeAdded: function(event) {
         if(event.meta.node.isRoot()) {
             this.canvas.reloadRoot();
             return;
         }
-        var parentElement = utils.findCanvasElement(event.meta.node.parent()),
-            nodeIndex = event.meta.node.getIndex(),
-            referenceElement, referenceAction, actionArg;
 
-        if(nodeIndex === 0) {
-            referenceElement = parentElement;
-            referenceAction = 'prepend';
-        } else {
-            referenceElement = parentElement.children()[nodeIndex-1];
-            referenceAction = 'after';
-        }
+        var containingNode = event.meta.node.parent(),
+            containingElement = utils.getElementForNode(containingNode);
 
-        actionArg = (checkForExistence && utils.findCanvasElement(event.meta.node, event.meta.parent)) || event.meta.node;
-        referenceElement[referenceAction](actionArg);
+        containingElement.handle(event);
     },
     nodeMoved: function(event) {
-        return handlers.nodeAdded.call(this, event, true);
+        return handlers.nodeAdded.call(this, event); //
+        //
     },
     nodeDetached: function(event) {
-        var canvasNode = utils.findCanvasElementInParent(event.meta.node, event.meta.parent);
-        canvasNode.detach();
+        var element = utils.getElementForDetachedNode(event.meta.node, event.meta.parent);
+        element.handle(event);
     },
     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;
-        }
-        if(toSet !== canvasElement.getText()) {
-            canvasElement.setText(toSet);
-        }
+        var element = utils.getElementForTextNode(event.meta.node);
+        element.handle(event);
     },
 
     metadataChanged: _metadataEventHandler,