fix html editor

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

index 77477bd..bdba027 100644 (file)
--- a/Roo/form/HtmlEditor.js
+++ b/Roo/form/HtmlEditor.js
@@ -59,7 +59,8 @@ Roo.form.HtmlEditor = Roo.extend(Roo.form.Field, {
      width: 500,
      
      /**
-     * @cfg {Array} stylesheets url of stylesheets.
+     * @cfg {Array} stylesheets url of stylesheets. set to [] to disable stylesheets.
+     * 
       */
      stylesheets: false,
      
@@ -176,13 +177,27 @@ Roo.form.HtmlEditor = Roo.extend(Roo.form.Field, {
      getDocMarkup : function(){
          // body styles..
          var st = '';
-        Roo.get(document.head).select('style').each(function(node) {
-            st += node.dom.outerHTML || new XMLSerializer().serializeToString(node.dom);
-        });
-        
-        Roo.get(document.head).select('link').each(function(node) { 
-            st += node.dom.outerHTML || new XMLSerializer().serializeToString(node.dom);
-        });
+        if (this.stylesheets === false) {
+            
+            Roo.get(document.head).select('style').each(function(node) {
+                st += node.dom.outerHTML || new XMLSerializer().serializeToString(node.dom);
+            });
+            
+            Roo.get(document.head).select('link').each(function(node) { 
+                st += node.dom.outerHTML || new XMLSerializer().serializeToString(node.dom);
+            });
+            
+        } else if (!this.stylesheets.length) {
+                // simple..
+                st = '<style type="text/css">' +
+                    'body{border:0;margin:0;padding:3px;height:98%;cursor:text;}' +
+                   '</style>';
+        } else {
+            Roo.each(this.stylesheets, function(s) {
+                st += '<link rel="stylesheet" type="text/css" href="' + s +'" />'
+            });
+            
+        }
          
          return '<html><head>' + st  +
              //<style type="text/css">' +
@@ -412,7 +427,7 @@ Roo.form.HtmlEditor = Roo.extend(Roo.form.Field, {
      syncValue : function(){
          if(this.initialized){
              var bd = (this.doc.body || this.doc.documentElement);
-            this.cleanUpPaste();
+            //this.cleanUpPaste();
              var html = bd.innerHTML;
              if(Roo.isSafari){
                  var bs = bd.getAttribute('style'); // Safari puts text-align styles on the body element!
@@ -590,7 +605,7 @@ Roo.form.HtmlEditor = Roo.extend(Roo.form.Field, {
      onEditorEvent : function(e){
          this.fireEvent('editorevent', this, e);
        //  this.updateToolbar();
-        this.syncValue();
+        this.syncValue(); //we can not sync so often.. sync cleans, so this breaks stuff
      },
  
      insertTag : function(tg)
@@ -684,6 +699,7 @@ Roo.form.HtmlEditor = Roo.extend(Roo.form.Field, {
                      break;
                      case 'u':
                          cmd = 'underline';
+                        break;
                      case 'v':
                          this.cleanUpPaste.defer(100, this);
                          return;
@@ -805,7 +821,7 @@ Roo.form.HtmlEditor = Roo.extend(Roo.form.Field, {
          
          
           
-        var range = this.createRange(this.getSelection());
+        var range = this.createRange(this.getSelection()).cloneRange();
          
          if (Roo.isIE) {
              var parent = range.parentElement();
@@ -986,11 +1002,28 @@ Roo.form.HtmlEditor = Roo.extend(Roo.form.Field, {
      cleanUpPaste :  function()
      {
          // cleans up the whole document..
-      //  console.log('cleanuppaste');
+         Roo.log('cleanuppaste');
          this.cleanUpChildren(this.doc.body);
+        var clean = this.cleanWordChars(this.doc.body.innerHTML);
+        if (clean != this.doc.body.innerHTML) {
+            this.doc.body.innerHTML = clean;
+        }
          
+    },
+    
+    cleanWordChars : function(input) {
+        var he = Roo.form.HtmlEditor;
+    
+        var output = input;
+        Roo.each(he.swapCodes, function(sw) { 
          
+            var swapper = new RegExp("\\u" + sw[0].toString(16), "g"); // hex codes
+            output = output.replace(swapper, sw[1]);
+        });
+        return output;
      },
+    
+    
      cleanUpChildren : function (n)
      {
          if (!n.childNodes.length) {
@@ -1023,7 +1056,16 @@ Roo.form.HtmlEditor = Roo.extend(Roo.form.Field, {
              return;
              
          }
-        if (Roo.form.HtmlEditor.remove.indexOf(node.tagName.toLowerCase()) > -1) {
+        
+        var remove_keep_children= Roo.form.HtmlEditor.remove.indexOf(node.tagName.toLowerCase()) > -1;
+        
+        // remove <a name=....> as rendering on yahoo mailer is bored with this.
+        
+        if (node.tagName.toLowerCase() == 'a' && !node.hasAttribute('href')) {
+            remove_keep_children = true;
+        }
+        
+        if (remove_keep_children) {
              this.cleanUpChildren(node);
              // inserts everything just before this node...
              while (node.childNodes.length) {
@@ -1098,10 +1140,17 @@ Roo.form.HtmlEditor = Roo.extend(Roo.form.Field, {
                  cleanStyle(a.name,a.value);
              }
              /// clean up MS crap..
+            // tecnically this should be a list of valid class'es..
+            
+            
              if (a.name == 'class') {
                  if (a.value.match(/^Mso/)) {
                      node.className = '';
                  }
+                
+                if (a.value.match(/body/)) {
+                    node.className = '';
+                }
              }
              
              // style cleanup!?
@@ -1212,3 +1261,16 @@ Roo.form.HtmlEditor.cwhite= [
          'font-size'
  ];
  
+
+Roo.form.HtmlEditor.swapCodes   =[ 
+    [    8211, "--" ], 
+    [    8212, "--" ], 
+    [    8216,  "'" ],  
+    [    8217, "'" ],  
+    [    8220, '"' ],  
+    [    8221, '"' ],  
+    [    8226, "*" ],  
+    [    8230, "..." ]
+]; 
+
+    
+\ No newline at end of file