Visual editor: hitting enter moves to a new tag - copy of current one (Chrome, FF)

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

diff --git a/modules/visualEditor.transformations.js b/modules/visualEditor.transformations.js
index 9d21f5d..1e8c2e0 100644 (file)
--- a/modules/visualEditor.transformations.js
+++ b/modules/visualEditor.transformations.js
@@ -11,25 +11,42 @@ if(typeof module !== 'undefined' && module.exports) {
             var inner = $(xml).clone();
             var toret = $('<div></div>');
             toret.append(inner);
             var inner = $(xml).clone();
             var toret = $('<div></div>');
             toret.append(inner);

-            toret.find('metadata').remove();

             
             var toBlock = ['div', 'document', 'section', 'header'];
             
             var toBlock = ['div', 'document', 'section', 'header'];

-            var toInline = ['aside'];
+            var toInline = ['aside', 'span'];

             
             toBlock.forEach(function(tagName) {
                 tagName = tagName.toLowerCase();
                 console.log('running ' + tagName);
                 toret.find(tagName).replaceWith(function() {
             
             toBlock.forEach(function(tagName) {
                 tagName = tagName.toLowerCase();
                 console.log('running ' + tagName);
                 toret.find(tagName).replaceWith(function() {

-                    var suffix = tagName !== 'div'  ? tagName : 'block';
-                    return $('<div></div>').addClass('rng-' + suffix).append($(this).contents());
+                    var currentTag = $(this);
+                    if(currentTag.attr('wlxml-tag'))
+                        return;
+                    var toret = $('<div></div>').attr('wlxml-tag', tagName);
+                    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() {
                 });
             });
             
             toInline.forEach(function(tagName) {
                 tagName = tagName.toLowerCase();
                 toret.find(tagName).replaceWith(function() {

-                    var node = this;
-                    return $('<span></span>').addClass('rng-' + tagName).append($(this).contents());
+                    var currentTag = $(this);
+                    if(currentTag.attr('wlxml-tag'))
+                        return;
+                    var toret = $('<span></span>').attr('wlxml-tag', tagName);
+                    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;

                 });
             });
             return toret.children();
                 });
             });
             return toret.children();


@@ -52,7 +69,42 @@ if(typeof module !== 'undefined' && module.exports) {
 
     transformations.toXML = {
         getXML: function(documentDescription) {
 
     transformations.toXML = {
         getXML: function(documentDescription) {

-            return documentDescription.HTMLTree;
+            
+            var inner = $(documentDescription.HTMLTree);
+            var toret = $('<div></div>');
+            toret.append(inner);
+            
+            toret.find('div, span').replaceWith(function() {
+                var div = $(this);
+                var tagName = div.attr('wlxml-tag');
+                var toret = $('<'+tagName+'>');
+                                   
+                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></metadata>\n');
+            _.each(_.keys(documentDescription.metadata), function(key) {
+                meta.append('\n\t<dc:'+key+'>' + documentDescription.metadata[key] + '</dc:'+key+'>');
+            });
+            meta.append('\n');
+            
+            toret.find('metadata').replaceWith(meta);
+            
+            return toret.html();
+            

         }
     }
 
         }
     }