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 49f9aa3..1e8c2e0 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);
             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'];
             
             var toBlock = ['div', 'document', 'section', 'header'];
             var toInline = ['aside', 'span'];


@@ -20,11 +19,15 @@ if(typeof module !== 'undefined' && module.exports) {
                 tagName = tagName.toLowerCase();
                 console.log('running ' + tagName);
                 toret.find(tagName).replaceWith(function() {
                 tagName = tagName.toLowerCase();
                 console.log('running ' + tagName);
                 toret.find(tagName).replaceWith(function() {

-                    var suffix = tagName !== 'div'  ? tagName : 'block';
-                    var toret = $('<div></div>').attr('wlxml-tag', suffix);

                     var currentTag = $(this);
                     var currentTag = $(this);

-                    if(currentTag.attr('class'))
-                        toret.attr('wlxml-class', currentTag.attr('class'));
+                    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;
                 });
                     toret.append(currentTag.contents());
                     return toret;
                 });


@@ -34,9 +37,14 @@ if(typeof module !== 'undefined' && module.exports) {
                 tagName = tagName.toLowerCase();
                 toret.find(tagName).replaceWith(function() {
                     var currentTag = $(this);
                 tagName = tagName.toLowerCase();
                 toret.find(tagName).replaceWith(function() {
                     var currentTag = $(this);

+                    if(currentTag.attr('wlxml-tag'))
+                        return;

                     var toret = $('<span></span>').attr('wlxml-tag', tagName);
                     var toret = $('<span></span>').attr('wlxml-tag', tagName);

-                    if(currentTag.attr('class'))
-                        toret.attr('wlxml-class', currentTag.attr('class'));
+                    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;
                 });
                     toret.append(currentTag.contents());
                     return toret;
                 });


@@ -69,15 +77,31 @@ if(typeof module !== 'undefined' && module.exports) {
             toret.find('div, span').replaceWith(function() {
                 var div = $(this);
                 var tagName = div.attr('wlxml-tag');
             toret.find('div, span').replaceWith(function() {
                 var div = $(this);
                 var tagName = div.attr('wlxml-tag');

-                return $('<'+tagName+'>').append(div.contents());
+                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>');
+            var meta = $('<metadata></metadata>\n');

             _.each(_.keys(documentDescription.metadata), function(key) {
             _.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 toret.html();