fixing wrapping DocumentElements

[fnpeditor.git] / modules / documentCanvas / canvas / documentElement.js

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index e18f856..f2ef09c 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -49,8 +49,10 @@ $.extend(DocumentElement.prototype, {
     },
 
     wrapWithNodeElement: function(wlxmlNode) {
     },
 
     wrapWithNodeElement: function(wlxmlNode) {

-        this.$element.wrap($('<' + wlxmlNode.tag + ' class="' + wlxmlNode.klass.replace('.', '-') + '">')[0]);
-        return documentElementFromHTMLElement(this.$element.parent().get(0), this.canvas);
+        var wrapper = DocumentNodeElement.create({tag: wlxmlNode.tag, klass: wlxmlNode.klass});
+        this.$element.replaceWith(wrapper.dom());
+        wrapper.append(this);
+        return wrapper;

     },
 
     childIndex: function(child) {
     },
 
     childIndex: function(child) {


@@ -112,10 +114,16 @@ $.extend(DocumentNodeElement.prototype, {
         this.$element.attr('wlxml-tag', tag);
     },
     getWlxmlClass: function() {
         this.$element.attr('wlxml-tag', tag);
     },
     getWlxmlClass: function() {

-        return this.$element.attr('wlxml-class').replace('-', '.');
+        var klass = this.$element.attr('wlxml-class');
+        if(klass)
+            return klass.replace('-', '.');
+        return undefined;

     },
     setWlxmlClass: function(klass) {
     },
     setWlxmlClass: function(klass) {

-        this.$element.attr('wlxml-class', klass);
+        if(klass)
+            this.$element.attr('wlxml-class', klass);
+        else
+            this.$element.removeAttr('wlxml-class');

     },
     is: function(what) {
         if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.$element.attr('wlxml-class')))
     },
     is: function(what) {
         if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.$element.attr('wlxml-class')))