From: Aleksander Ɓukasz Date: Fri, 14 Mar 2014 12:30:49 +0000 (+0100) Subject: editor: some refactoring & cleanup X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/eb45e596e503a841c210b9773de0ccdbb0d3c2eb?ds=sidebyside editor: some refactoring & cleanup --- diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js index 476a95b..5cfc015 100644 --- a/src/editor/modules/documentCanvas/canvas/canvas.js +++ b/src/editor/modules/documentCanvas/canvas/canvas.js @@ -97,18 +97,9 @@ $.extend(Canvas.prototype, { }, reloadRoot: function() { - var canvasDOM = this.generateCanvasDOM(this.wlxmlDocument.root); - //var canvasDOM = this.wlxmlDocument.root.getData('canvasElement') ? this.wlxmlDocument.root.getData('canvasElement').dom() : this.generateCanvasDOM(this.wlxmlDocument.root); - + this.rootElement = this.createElement(this.wlxmlDocument.root); this.wrapper.empty(); - this.wrapper.append(canvasDOM); - this.d = this.wrapper.children(0); - }, - - generateCanvasDOM: function(wlxmlNode) { - //var element = new documentElement.DocumentNodeElement(wlxmlNode, this); - //return element.dom(); - return this.createElement(wlxmlNode).dom(); + this.wrapper.append(this.rootElement.dom()); }, setupEventHandling: function() { @@ -222,10 +213,7 @@ $.extend(Canvas.prototype, { }, doc: function() { - if(this.d === null) { - return null; - } - return this.getDocumentElement(this.d[0]); + return this.rootElement; }, toggleElementHighlight: function(node, toggle) {