documentCanvas - removing yellow "glow" around contenteditable element in Chrome

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

diff --git a/modules/visualEditor.transformations.js b/modules/visualEditor.transformations.js
index 1e8c2e0..1fef83a 100644 (file)
--- a/modules/visualEditor.transformations.js
+++ b/modules/visualEditor.transformations.js
@@ -1,8 +1,4 @@
-if(typeof module !== 'undefined' && module.exports) {
-    var $ = require('jquery');
-}
-
-(function($) {
+define(['libs/jquery-1.9.1.min'], function($) {
 
     var transformations = {};
 
@@ -12,43 +8,33 @@ if(typeof module !== 'undefined' && module.exports) {
             var toret = $('<div></div>');
             toret.append(inner);
             
-            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 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;
+            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);
-                    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;
-                });
-            });
+            transform(toBlock, 'div');
+            transform(toInline, 'span');
+
             return toret.children();
         },
         getMetaData: function(xml) {
@@ -101,18 +87,22 @@ if(typeof module !== 'undefined' && module.exports) {
             });
             meta.append('\n');
             
-            toret.find('metadata').replaceWith(meta);
+            var metadata = toret.find('metadata');
+            if(metadata.length === 0) {
+                var section = toret.find('section');
+                section = section.length ? $(section[0]) : null;
+                if(section) {
+                    section.prepend(meta)
+                }
+            } else {
+                metadata.replaceWith(meta);
+            }
             
-            return toret.html();
             
+            return vkbeautify.xml(toret.html());
         }
     }
 
+    return transformations;
 
-    if(typeof module !== 'undefined' && module.exports) {
-        module.exports = transformations;
-    } else {
-        rng.modules.visualEditor.transformations = transformations;
-    }
-
-})($);
\ No newline at end of file
+});
\ No newline at end of file