Fix #5859 - Fw: Fw: Text sticking together

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

index 3c3a511..eee4f05 100644 (file)
--- a/Roo/HtmlEditorCore.js
+++ b/Roo/HtmlEditorCore.js
@@ -133,7 +133,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
      black: false,
      white: false,
       
-    
+    bodyCls : '',
  
      /**
       * Protected method that will not generally be called directly. It
@@ -161,19 +161,26 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
                      'body{border:0;margin:0;padding:3px;height:98%;cursor:text;}' +
                     '</style>';
          } else { 
-            
+            st = '<style type="text/css">' +
+                    this.stylesheets +
+                '</style>';
          }
          
          st +=  '<style type="text/css">' +
              'IMG { cursor: pointer } ' +
          '</style>';
  
+        var cls = 'roo-htmleditor-body';
+        
+        if(this.bodyCls.length){
+            cls += ' ' + this.bodyCls;
+        }
          
          return '<html><head>' + st  +
              //<style type="text/css">' +
              //'body{border:0;margin:0;padding:3px;height:98%;cursor:text;}' +
              //'</style>' +
-            ' </head><body class="roo-htmleditor-body"></body></html>';
+            ' </head><body class="' +  cls + '"></body></html>';
      },
  
      // private
@@ -360,7 +367,6 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
              
              if(this.owner.fireEvent('beforepush', this, v) !== false){
                  var d = (this.doc.body || this.doc.documentElement);
-                Roo.log(d);
                  d.innerHTML = v;
                  this.cleanUpPaste();
                  this.el.dom.value = d.innerHTML;
@@ -1049,7 +1055,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
              if (v.match(/^\./) || v.match(/^\//)) {
                  return;
              }
-            if (v.match(/^(http|https):\/\//) || v.match(/^mailto:/)) {
+            if (v.match(/^(http|https):\/\//) || v.match(/^mailto:/) || v.match(/^ftp:/)) {
                  return;
              }
              if (v.match(/^#/)) {
@@ -1138,7 +1144,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
                      node.className = '';
                  }
                  
-                if (a.value.match(/body/)) {
+                if (a.value.match(/^body$/)) {
                      node.className = '';
                  }
                  continue;
@@ -1160,12 +1166,23 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
       */
      cleanWord : function(node)
      {
-        
-        
          if (!node) {
              this.cleanWord(this.doc.body);
              return;
          }
+        
+        if(
+                node.nodeName == 'SPAN' &&
+                !node.hasAttributes() &&
+                node.childNodes.length == 1 &&
+                node.firstChild.nodeName == "#text"
+        ) {
+            var text = ' ' + node.innerHTML + ' ';
+            var textNode = document.createTextNode(text);
+            node.parentNode.insertBefore(textNode, node);
+            node.parentNode.removeChild(node);
+        }
+        
          if (node.nodeName == "#text") {
              // clean up silly Windows -- stuff?
              return; 
@@ -1549,6 +1566,17 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
          Roo.each(Roo.get(_this.iframe.contentDocument.head).select('link[rel=stylesheet]', true).elements, function(s){
              s.remove();
          });
+    },
+    
+    setStyle : function(style)
+    {
+        Roo.get(this.iframe.contentDocument.head).createChild({
+            tag : 'style',
+            type : 'text/css',
+            html : style
+        });
+
+        return;
      }
      
      // hide stuff that is not compatible