From 880c488dbdf310c616a237274d84d93517403372 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Thu, 13 Mar 2014 12:18:15 +0100 Subject: [PATCH] canvas: no need to handle nodeTagChange event anymore --- .../documentCanvas/canvas/documentElement.js | 27 +++---------------- .../documentCanvas/canvas/wlxmlListener.js | 5 ---- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/src/editor/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js index afa510f..f4505b0 100644 --- a/src/editor/modules/documentCanvas/canvas/documentElement.js +++ b/src/editor/modules/documentCanvas/canvas/documentElement.js @@ -141,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()); @@ -202,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'); @@ -228,22 +223,6 @@ $.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() { this.manager = wlxmlManagers.getFor(this); this.manager.setup(); }, diff --git a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js index cbf8d08..f932ea0 100644 --- a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js +++ b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js @@ -42,11 +42,6 @@ var handlers = { canvasNode.setWlxmlClass(event.meta.newVal); } }, - nodeTagChange: function(event) { - var canvasNode = utils.findCanvasElement(event.meta.node); - canvasNode.setWlxmlTag(event.meta.newTagName); - canvasNode.wlxmlNode = event.meta.node; - }, nodeAdded: function(event, checkForExistence) { if(event.meta.node.isRoot()) { this.canvas.reloadRoot(); -- 2.20.1