Fix #6901 - CRM - allow comments in HTML for IE

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

index c99e460..a1bb73d 100644 (file)
--- a/Roo/HtmlEditorCore.js
+++ b/Roo/HtmlEditorCore.js
@@ -114,6 +114,11 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
       */
      stylesheets: false,
      
+    /**
+     * @cfg {boolean} allowComments - default false - allow comments in HTML source - by default they are stripped - if you are editing email you may need this.
+     */
+    
+    allowComments: false,
      // id of frame..
      frameId: false,
      
@@ -160,10 +165,11 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
                  st = '<style type="text/css">' +
                      'body{border:0;margin:0;padding:3px;height:98%;cursor:text;}' +
                     '</style>';
-        } else { 
-            st = '<style type="text/css">' +
-                    this.stylesheets +
-                '</style>';
+        } else {
+            for (var i in this.stylesheets) { 
+                st += '<link rel="stylesheet" href="' + this.stylesheets[i] +'" type="text/css">';
+            }
+            
          }
          
          st +=  '<style type="text/css">' +
@@ -180,7 +186,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
              //<style type="text/css">' +
              //'body{border:0;margin:0;padding:3px;height:98%;cursor:text;}' +
              //'</style>' +
-            ' </head><body class="' +  cls + '"></body></html>';
+            ' </head><body contenteditable="true" data-enable-grammerly="true" class="' +  cls + '"></body></html>';
      },
  
      // private
@@ -544,7 +550,11 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
      insertTag : function(tg)
      {
          // could be a bit smarter... -> wrap the current selected tRoo..
-        if (tg.toLowerCase() == 'span' || tg.toLowerCase() == 'code') {
+        if (tg.toLowerCase() == 'span' ||
+            tg.toLowerCase() == 'code' ||
+            tg.toLowerCase() == 'sup' ||
+            tg.toLowerCase() == 'sub' 
+            ) {
              
              range = this.createRange(this.getSelection());
              var wrappingNode = this.doc.createElement(tg.toLowerCase());
@@ -1022,7 +1032,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
              // clean up silly Windows -- stuff?
              return; 
          }
-        if (node.nodeName == "#comment") {
+        if (node.nodeName == "#comment" && !this.allowComments) {
              node.parentNode.removeChild(node);
              // clean up silly Windows -- stuff?
              return; 
@@ -1085,6 +1095,9 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
              if (v.match(/^#/)) {
                  return;
              }
+            if (v.match(/^\{/)) { // allow template editing.
+                return;
+            }
  //            Roo.log("(REMOVE TAG)"+ node.tagName +'.' + n + '=' + v);
              node.removeAttribute(n);
              
@@ -1227,16 +1240,20 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
              node.parentNode.removeChild(node);
              return;
          }
-        
+        //Roo.log(node.tagName);
          // remove - but keep children..
-        if (node.tagName.toLowerCase().match(/^(meta|link|\\?xml:|st1:|o:|font)/)) {
+        if (node.tagName.toLowerCase().match(/^(meta|link|\\?xml:|st1:|o:|v:|font)/)) {
+            //Roo.log('-- removed');
              while (node.childNodes.length) {
                  var cn = node.childNodes[0];
                  node.removeChild(cn);
                  node.parentNode.insertBefore(cn, node);
+                // move node to parent - and clean it..
+                this.cleanWord(cn);
              }
              node.parentNode.removeChild(node);
-            this.iterateChildren(node, this.cleanWord);
+            /// no need to iterate chidlren = it's got none..
+            //this.iterateChildren(node, this.cleanWord);
              return;
          }
          // clean styles
@@ -1714,8 +1731,8 @@ Roo.HtmlEditorCore.cblack= [
  
  
  Roo.HtmlEditorCore.swapCodes   =[ 
-    [    8211, "--" ], 
-    [    8212, "--" ], 
+    [    8211, "&#8211;" ], 
+    [    8212, "&#8212;" ], 
      [    8216,  "'" ],  
      [    8217, "'" ],  
      [    8220, '"' ],