wlxml: extending isInside/getParent/is to support tag name

[fnpeditor.git] / src / editor / modules / documentCanvas / canvas / canvas.js

diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js
index 476a95b..b217d18 100644 (file)
--- 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) {
@@ -257,6 +245,11 @@ $.extend(Canvas.prototype, {
     },
 
     setCurrentElement: function(element, params) {
+        if(!element) {
+            logger.debug('Invalid element passed to setCurrentElement: ' + element);
+            return;
+        }
+
         if(!(element instanceof documentElement.DocumentElement)) {
             element = utils.findCanvasElement(element);
         }