X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/abd8692003a505de041558bd43f0ce1e884e8bbd..eb45e596e503a841c210b9773de0ccdbb0d3c2eb:/src/editor/modules/documentCanvas/canvas/documentElement.js?ds=sidebyside

diff --git a/src/editor/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js
index 2c146bb..f4505b0 100644
--- a/src/editor/modules/documentCanvas/canvas/documentElement.js
+++ b/src/editor/modules/documentCanvas/canvas/documentElement.js
@@ -19,7 +19,6 @@ var DocumentElement = function(wlxmlNode, canvas) {
 
     this.$element = this.createDOM();
     this.$element.data('canvas-element', this);
-    this.data('wlxmlNode', wlxmlNode);
 };
 
 $.extend(DocumentElement.prototype, {
@@ -29,14 +28,6 @@ $.extend(DocumentElement.prototype, {
     dom: function() {
         return this.$element;
     },
-    data: function() {
-        var dom = this.dom(),
-            args = Array.prototype.slice.call(arguments, 0);
-        if(args.length === 2 && args[1] === undefined) {
-            return dom.removeData(args[0]);
-        }
-        return dom.data.apply(dom, arguments);
-    },
     parent: function() {
         var parents = this.$element.parents('[document-node-element]');
         if(parents.length) {
@@ -107,9 +98,8 @@ $.extend(DocumentElement.prototype, {
     },
 
     exec: function(method) {
-        var manager = this.data('_wlxmlManager');
-        if(manager[method]) {
-            return manager[method].apply(manager, Array.prototype.slice.call(arguments, 1));
+        if(this.manager && this.manager[method]) {
+            return this.manager[method].apply(this.manager, Array.prototype.slice.call(arguments, 1));
         }
     }
 });
@@ -151,7 +141,9 @@ $.extend(DocumentNodeElement.prototype, {
         // Make sure widgets aren't navigable with arrow keys
         widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
         this.$element = dom; //@!!!
-        this.setWlxml({tag: this.wlxmlNode.getTagName(), klass: this.wlxmlNode.getClass()});
+
+        this.setWlxmlTag(this.wlxmlNode.getTagName());
+        this.setWlxmlClass(this.wlxmlNode.getClass());
 
         this.wlxmlNode.contents().forEach(function(node) {
             container.append(this.canvas.createElement(node).dom());
@@ -212,14 +204,7 @@ $.extend(DocumentNodeElement.prototype, {
         return this._container().attr('wlxml-tag');
     },
     setWlxmlTag: function(tag) {
-        if(tag === this.getWlxmlTag()) {
-            return;
-        }
-
         this._container().attr('wlxml-tag', tag);
-        if(!this.__updatingWlxml) {
-            this._updateWlxmlManager();
-        }
     },
     getWlxmlClass: function() {
         var klass = this._container().attr('wlxml-class');
@@ -238,25 +223,8 @@ $.extend(DocumentNodeElement.prototype, {
         else {
             this._container().removeAttr('wlxml-class');
         }
-        if(!this.__updatingWlxml) {
-            this._updateWlxmlManager();
-        }
-    },
-    setWlxml: function(params) {
-        this.__updatingWlxml = true;
-        if(params.tag !== undefined) {
-            this.setWlxmlTag(params.tag);
-        }
-        if(params.klass !== undefined) {
-            this.setWlxmlClass(params.klass);
-        }
-        this._updateWlxmlManager();
-        this.__updatingWlxml = false;
-    },
-    _updateWlxmlManager: function() {
-        var manager = wlxmlManagers.getFor(this);
-        this.data('_wlxmlManager', manager);
-        manager.setup();
+        this.manager = wlxmlManagers.getFor(this);
+        this.manager.setup();
     },
     is: function(what) {
         if(what === 'list' && _.contains(['list.items', 'list.items.enum'], this.getWlxmlClass())) {
@@ -276,9 +244,8 @@ $.extend(DocumentNodeElement.prototype, {
     },
 
     toggle: function(toggle) {
-        var mng = this.data('_wlxmlManager');
-        if(mng) {
-            mng.toggle(toggle);
+        if(this.manager) {
+            this.manager.toggle(toggle);
         }
     }
 });