Changeset 468

Timestamp:

03/03/06 16:04:39 (7 years ago)

Author:

wymsy

Message:

Bug fix: reg exp that extracted tags could crash the browser on comments containing an unmatched '<';

Files:

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

trunk/plugins/GetHtml/get-html.js

@@ -54 +54 @@
 /*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),//find content NOT inside comments
-/*21*/  new RegExp().compile(/\S*=""/g) //find empty attributes
+/*21*/  new RegExp().compile(/\S*=""/g), //find empty attributes
+/*22*/  new RegExp().compile(/<!--[\s\S]*?-->|<\?[\s\S]*?\?>|<[^>]*>/g) //find all tags, including comments and php
 ];
 
@@ -132 +133 @@
 HTMLArea.getHTML = function(root, outputRoot, editor) {
         var html = "";
+        var c = HTMLArea.RegExpCache;
 
         if(root.nodeType == 11) {//document fragment
@@ -141 +143 @@
                         temp.appendChild(j.cloneNode(true));
             }
-            html += temp.innerHTML.replace(/<[^\?!][^>]*>/gi, function(tag){return editor.cleanHTML(tag)});
+            html += temp.innerHTML.replace(c[22], function(tag){
+                        if(/^<[!\?]/.test(tag)) return tag; //skip comments and php tags
+                        else return editor.cleanHTML(tag)});
 
         } else {
@@ -167 +171 @@
                 //pass tags to cleanHTML() one at a time
                 //includes support for htmlRemoveTags config option
-                html += innerhtml.replace(/<((<[^>]*>)*|[^<>]*)*>/gi, function(tag){
+                html += innerhtml.replace(c[22], 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'))))