Visual editor - beautify source

[fnpeditor.git] / modules / visualEditor.transformations.js

diff --git a/modules/visualEditor.transformations.js b/modules/visualEditor.transformations.js
index 725aaea..d45109f 100644 (file)
--- a/modules/visualEditor.transformations.js
+++ b/modules/visualEditor.transformations.js
@@ -11,35 +11,34 @@ if(typeof module !== 'undefined' && module.exports) {
             var inner = $(xml).clone();
             var toret = $('<div></div>');
             toret.append(inner);
-            toret.find('metadata').remove();
             
-            var toBlock = ['div', 'document', 'section', 'header'];
+            var toBlock = ['div', 'section', 'header'];
             var toInline = ['aside', 'span'];
             
-            toBlock.forEach(function(tagName) {
-                tagName = tagName.toLowerCase();
-                console.log('running ' + tagName);
-                toret.find(tagName).replaceWith(function() {
-                    var toret = $('<div></div>').attr('wlxml-tag', tagName);
-                    var currentTag = $(this);
-                    if(currentTag.attr('class'))
-                        toret.attr('wlxml-class', currentTag.attr('class').replace(/\./g, '-'));
-                    toret.append(currentTag.contents());
-                    return toret;
+            var transform = function(tags, replacingTagName) {
+                tags.forEach(function(tagName) {
+                    tagName = tagName.toLowerCase();
+                    console.log('running ' + tagName);
+                    toret.find(tagName).replaceWith(function() {
+                        var currentTag = $(this);
+                        if(currentTag.attr('wlxml-tag'))
+                            return;
+                        var toret = $('<' + replacingTagName + '>').attr('wlxml-tag', tagName);
+                        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;
+                    });
                 });
-            });
+            }
             
-            toInline.forEach(function(tagName) {
-                tagName = tagName.toLowerCase();
-                toret.find(tagName).replaceWith(function() {
-                    var currentTag = $(this);
-                    var toret = $('<span></span>').attr('wlxml-tag', tagName);
-                    if(currentTag.attr('class'))
-                        toret.attr('wlxml-class', currentTag.attr('class').replace(/\./g, '-'));
-                    toret.append(currentTag.contents());
-                    return toret;
-                });
-            });
+            transform(toBlock, 'div');
+            transform(toInline, 'span');
+
             return toret.children();
         },
         getMetaData: function(xml) {
@@ -69,21 +68,33 @@ if(typeof module !== 'undefined' && module.exports) {
                 var div = $(this);
                 var tagName = div.attr('wlxml-tag');
                 var toret = $('<'+tagName+'>');
-                if(div.attr('wlxml-class'))
-                    toret.attr('class', div.attr('wlxml-class').replace(/-/g, '.'))
+                                   
+                for(var i = 0; i < this.attributes.length; i++) {
+                    var attr = this.attributes.item(i);
+                    var split = attr.name.split('-')
+                    console.log(split);
+                    if(split[0] !== 'wlxml' || (split.length > 1 && split[1] === 'tag')) 
+                        continue;
+                    var wlxmlName = split.splice(1).join('-');
+                    var value = wlxmlName === 'class' ? attr.value.replace(/-/g, '.') : attr.value;
+                    console.log(name + ': ' + value);
+                    toret.attr(wlxmlName, value);
+                }
+                    
                 toret.append(div.contents());
                 return toret;
             });
             
-            var meta = $('<metadata>');
+            var meta = $('<metadata></metadata>\n');
             _.each(_.keys(documentDescription.metadata), function(key) {
-                meta.append($('<dc:'+key+'>' + documentDescription.metadata[key] + '</dc:'+key+'>'));
+                meta.append('\n\t<dc:'+key+'>' + documentDescription.metadata[key] + '</dc:'+key+'>');
             });
+            meta.append('\n');
             
-            toret.find('document').prepend(meta);
+            toret.find('metadata').replaceWith(meta);
             
-            return toret.html();
             
+            return vkbeautify.xml(toret.html());
         }
     }