Visual editor: tabs view supports icons in tab titles

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

diff --git a/modules/visualEditor.transformations.js b/modules/visualEditor.transformations.js
index f9fcb1f..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 = {};
 
 
     var transformations = {};
 


@@ -12,7 +8,7 @@ if(typeof module !== 'undefined' && module.exports) {
             var toret = $('<div></div>');
             toret.append(inner);
             
             var toret = $('<div></div>');
             toret.append(inner);
             

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

             var toInline = ['aside', 'span'];
             
             var transform = function(tags, replacingTagName) {
             var toInline = ['aside', 'span'];
             
             var transform = function(tags, replacingTagName) {


@@ -24,6 +20,7 @@ if(typeof module !== 'undefined' && module.exports) {
                         if(currentTag.attr('wlxml-tag'))
                             return;
                         var toret = $('<' + replacingTagName + '>').attr('wlxml-tag', tagName);
                         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;
                         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;


@@ -90,18 +87,22 @@ if(typeof module !== 'undefined' && module.exports) {
             });
             meta.append('\n');
             
             });
             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