sync

[roojs1] / Roo / HtmlEditorCore.js
diff --git a/Roo/HtmlEditorCore.js b/Roo/HtmlEditorCore.js

index 64b7d21..59011b8 100644 (file)
--- a/Roo/HtmlEditorCore.js
+++ b/Roo/HtmlEditorCore.js
@@ -195,14 +195,16 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
          st +=  '<style type="text/css">' +
              'IMG { cursor: pointer } ' +
          '</style>';
-
-        var cls = 'roo-htmleditor-body';
+        
+        st += '<meta name="google" content="notranslate">'
+        
+        var cls = 'notranslate roo-htmleditor-body';
          
          if(this.bodyCls.length){
              cls += ' ' + this.bodyCls;
          }
          
-        return '<html><head>' + st  +
+        return '<html  class="notranslate" translate="no"><head>' + st  +
              //<style type="text/css">' +
              //'body{border:0;margin:0;padding:3px;height:98%;cursor:text;}' +
              //'</style>' +
@@ -329,7 +331,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
       * @param {String} html The HTML to be cleaned
       * return {String} The cleaned HTML
       */
-    cleanHtml : function(html){
+    cleanHtml : function(html)
+    {
          html = String(html);
          if(html.length > 5){
              if(Roo.isSafari){ // strip safari nonsense
@@ -361,15 +364,19 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
              
              var div = document.createElement('div');
              div.innerHTML = bd.innerHTML;
-             
+            
+            
             
              if (this.enableBlocks) {
                  new Roo.htmleditor.FilterBlock({ node : div });
              }
              //?? tidy?
+            var tidy = new Roo.htmleditor.TidySerializer({
+                inner:  true
+            });
+            var html  = tidy.serialize(div)
              
              
-            var html = div.innerHTML;
              if(Roo.isSafari){
                  var bs = bd.getAttribute('style'); // Safari puts text-align styles on the body element!
                  var m = bs ? bs.match(/text-align:(.*?);/i) : false;
@@ -508,6 +515,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
          //var ss = this.el.getStyles( 'background-image', 'background-repeat');
          //ss['background-attachment'] = 'fixed'; // w3c
          dbody.bgProperties = 'fixed'; // ie
+        dbody.setAttribute("translate", "no");
+        
          //Roo.DomHelper.applyStyles(dbody, ss);
          Roo.EventManager.on(this.doc, {