Refactoring - using DocumentNodeElement.createDOM when creating document from wlxml

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index cf46d5e..4344730 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -22,16 +22,13 @@ $.extend(Canvas.prototype, {
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
                     return;
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
                     return;

-                var toret = $('<div>')
-                    .attr('wlxml-tag', currentTag.prop('tagName').toLowerCase());
-                //toret.attr('id', 'xxxxxxxx-xxxx-xxxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {var r = Math.random()*16|0,v=c=='x'?r:r&0x3|0x8;return v.toString(16);}));
-                for(var i = 0; i < this.attributes.length; i++) {
-                    var attr = this.attributes.item(i);
-                    var value = attr.name === 'class' ? attr.value.replace(/\./g, '-') : attr.value;
-                    toret.attr('wlxml-' + attr.name, value);
-                }
-                toret.append(currentTag.contents());
-                return toret;
+                var element = documentElement.DocumentNodeElement.createDOM({
+                    tag: currentTag.prop('tagName').toLowerCase(),
+                    klass: currentTag.attr('class')
+                });
+
+                element.append(currentTag.contents());
+                return element;

             });
 
             wrapper.find(':not(iframe)').addBack().contents()
             });
 
             wrapper.find(':not(iframe)').addBack().contents()

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index d2d3a64..f6137ef 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -77,9 +77,10 @@ var DocumentNodeElement = function(htmlElement, canvas) {
 
 $.extend(DocumentNodeElement, {
     createDOM: function(params) {
 
 $.extend(DocumentNodeElement, {
     createDOM: function(params) {

-        var dom = $('<div>').attr('wlxml-tag', params.tag);
+        var dom = $('<div>')
+            .attr('wlxml-tag', params.tag);

         if(params.klass)
         if(params.klass)

-            dom.attr('wlxml-class', params.klass);
+            dom.attr('wlxml-class', params.klass.replace(/\./g, '-'));

         return dom;
     },
 
         return dom;
     },