Visual editor: handling formatting of metadata tag in the xml source better

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

diff --git a/modules/visualEditor.transformations.js b/modules/visualEditor.transformations.js
index cfb5877..57049e7 100644 (file)
--- a/modules/visualEditor.transformations.js
+++ b/modules/visualEditor.transformations.js
@@ -11,7 +11,6 @@ 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 toInline = ['aside', 'span'];
@@ -20,16 +19,28 @@ if(typeof module !== 'undefined' && module.exports) {
                 tagName = tagName.toLowerCase();
                 console.log('running ' + tagName);
                 toret.find(tagName).replaceWith(function() {
-                    var suffix = tagName !== 'div'  ? tagName : 'block';
-                    return $('<div></div>').addClass('rng rng-' + suffix).append($(this).contents());
+                    var currentTag = $(this);
+                    if(currentTag.attr('wlxml-tag'))
+                        return;
+                    var toret = $('<div></div>').attr('wlxml-tag', tagName);
+                    if(currentTag.attr('class'))
+                        toret.attr('wlxml-class', currentTag.attr('class').replace(/\./g, '-'));
+                    toret.append(currentTag.contents());
+                    return toret;
                 });
             });
             
             toInline.forEach(function(tagName) {
                 tagName = tagName.toLowerCase();
                 toret.find(tagName).replaceWith(function() {
-                    var node = this;
-                    return $('<span></span>').addClass('rng rng-' + tagName).append($(this).contents());
+                    var currentTag = $(this);
+                    if(currentTag.attr('wlxml-tag'))
+                        return;
+                    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;
                 });
             });
             return toret.children();
@@ -59,16 +70,21 @@ if(typeof module !== 'undefined' && module.exports) {
             
             toret.find('div, span').replaceWith(function() {
                 var div = $(this);
-                var tagName = div.attr('class').split('rng-')[1];
-                return $('<'+tagName+'>').append(div.contents());
+                var tagName = div.attr('wlxml-tag');
+                var toret = $('<'+tagName+'>');
+                if(div.attr('wlxml-class'))
+                    toret.attr('class', div.attr('wlxml-class').replace(/-/g, '.'))
+                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();