Remove sniffing when branching escapeHTML and unescapeHTML. [#570…

… state:resolved] (kangax)
prototypejs · Mar 8, 2009 · 7833e8c · 7833e8c
1 parent 4453e62
commit 7833e8c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+* Remove sniffing when branching `escapeHTML` and `unescapeHTML`. [#570 state:resolved] (kangax)
+
 * Redefine Element#down in IE 6-7 to avoid extending all descendants when no selector is given. [#452 state:resolved] (eno, Andrew Dupont)
 
 * Reverse the definitions of Event#pointer(X|Y) and Event#pointer to prevent unnecessary computation. [#403 state:resolved] (Nick Stakenburg, Andrew Dupont)

diff --git a/src/lang/string.js b/src/lang/string.js
@@ -176,7 +176,7 @@ Object.extend(String.prototype, (function() {
    *  Strips tags and converts the entity forms of special HTML characters to their normal form.
   **/
   function unescapeHTML() {
-    var div = new Element('div');
+    var div = document.createElement('div');
     div.innerHTML = this.stripTags();
     return div.childNodes[0] ? (div.childNodes.length > 1 ? 
       $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) : 
@@ -437,19 +437,21 @@ Object.extend(String.prototype, (function() {
   };
 })());
 
-if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
-  escapeHTML: function() {
-    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-  },
-  unescapeHTML: function() {
-    return this.stripTags().replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&');
-  }
-});
-
 Object.extend(String.prototype.escapeHTML, {
   div:  document.createElement('div'),
   text: document.createTextNode('')
 });
 
 String.prototype.escapeHTML.div.appendChild(String.prototype.escapeHTML.text);
 
+if ('<\n'.escapeHTML() !== '&lt;\n') {
+  String.prototype.escapeHTML = function() {
+    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+  }
+}
+
+if ('&lt;\n'.unescapeHTML() !== '<\n') {
+  String.prototype.unescapeHTML = function() {
+    return this.stripTags().replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&');
+  }
+}