Changeset 425

Timestamp:

11/21/05 14:54:02 (7 years ago)

Author:

wymsy

Message:

Fix for ticket #591; comments containing tags are now handled correctly; pre (and script) tags containing comments are now handled correctly (ticket #253)

Files:

• trunk/plugins/GetHtml/get-html.js (modified) (4 diffs)

trunk/plugins/GetHtml/get-html.js

@@ -50 +50 @@
 /*16*/  new RegExp().compile(/<(div|p|h[1-6]|table|tr|td|th|ul|ol|li|blockquote|object|html|head|body|script)( [^>]*)?>/g),//blocklevel opening tag
 /*17*/  new RegExp().compile(/<(br|hr|img|embed|param|pre|meta|link|title)[^>]*>/g),//singlet tag
-/*18*/  new RegExp().compile(/(^|<\/(pre|script)>)(\s|[^\s])*?(<(pre|script)[^>]*>|$)/g),//exclude content between pre and script tags
+/*18*/  new RegExp().compile(/(^|<\/(pre|script)>)(\s|[^\s])*?(<(pre|script)[^>]*>|$)/g),//find content NOT inside pre and script tags
 /*19*/  new RegExp().compile(/(<pre[^>]*>)(\s|[^\s])*?(<\/pre>)/g),//find content inside pre tags
-/*20*/  new RegExp().compile(/(^|<!--(\s|\S)*?-->)((\s|\S)*?)(?=<!--(\s|\S)*?-->|$)/g)//exclude comments
+/*20*/  new RegExp().compile(/(^|<!--(\s|\S)*?-->)((\s|\S)*?)(?=<!--(\s|\S)*?-->|$)/g)//find content NOT inside comments
 ];
 
@@ -94 +94 @@
                 s = s.replace(c[19], function(str){return str.replace(/<br \/>/g,"\n")});
         }
-        s = s.replace(c[20], function(st,$1,$2,$3) { //exclude comments
-          strn = $3.replace(c[18], function(string) { //skip pre and script tags
-                string = string.replace(/[\n\r]/gi, " ").replace(/\s+/gi," ").replace(c[14], function(str) {
+        s = s.replace(c[18], function(strn) { //skip pre and script tags
+          strn = strn.replace(c[20], function(st,$1,$2,$3) { //exclude comments
+                string = $3.replace(/[\n\r]/gi, " ").replace(/\s+/gi," ").replace(c[14], function(str) {
                         if (str.match(c[16])) {
                                 var s = "\n" + HTMLArea.__sindent + str;
@@ -117 +117 @@
                         return str; // this won't actually happen
                 });
-                return string;
-      });return $1 + strn;
+                return $1 + string;
+          });return strn;
     });
     if (s.charAt(0) == "\n") {
@@ -162 +162 @@
                         innerhtml = editor._doc.body.innerHTML;
                 }
-                //pass tags to cleanHTML() one at a time; ignore comments and php tags
+                //pass tags to cleanHTML() one at a time
                 //includes support for htmlRemoveTags config option
-                html += innerhtml.replace(/<[^\?!][^>]*>/gi, function(tag){
-                        if(!(editor.config.htmlRemoveTags && editor.config.htmlRemoveTags.test(tag.replace(/<([^\s>\/]+)/,'$1'))))
-                        return editor.cleanHTML(tag);
+                html += innerhtml.replace(/<((<[^>]*>)*|[^<>]*)*>/gi, function(tag){
+                        if(/^<[!\?]/.test(tag)) return tag; //skip comments and php tags
+                        else if(!(editor.config.htmlRemoveTags && editor.config.htmlRemoveTags.test(tag.replace(/<([^\s>\/]+)/,'$1'))))
+                                return editor.cleanHTML(tag);
                         else return ''});
                 //IE drops  all </li> tags in a list except the last one