Ticket #8452: Fix-String-escapeHTML-and-String-unescapeHTML.patch

a/src/string.js

@@ -78 +78 @@
-  escapeHTML: function() {
-    var self = arguments.callee;
-    self.text.data = this;
-div
+wrapper
-  },
-
-  unescapeHTML: function() {
-    var div = new Element('div');
-
-
-
+
+
+
+
-      div.childNodes[0].nodeValue) : '';
-  },
-  
@@ -206 +207 @@
-  }
-});
-
-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(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
-  }
-});
-
-String.prototype.gsub.prepareReplacement = function(replacement) {
-  if (Object.isFunction(replacement)) return replacement;
-  var template = new Template(replacement);
@@ -223 +215 @@
-
-String.prototype.parseQuery = String.prototype.toQueryParams;
-
+if (Prototype.Browser.IE)
+  String.prototype.unescapeHTML = String.prototype.unescapeHTML.wrap(function(proceed){
+    return proceed().replace(/\r/g,'\n')
+  });
+if (Prototype.Browser.WebKit && Prototype.BrowserFeatures.SelectorsAPI)
+  String.prototype.escapeHTML = new Function('',
+    String.prototype.escapeHTML.toString().substring(14).replace(/;?\s*}$/,'') + '.replace(/>/g,"&gt;")'
+  );
+
-Object.extend(String.prototype.escapeHTML, {
-div:  document.createElement('div
+wrapper: document.createElement('pre
-  text: document.createTextNode('')
-});
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-var Template = Class.create({
-  initialize: function(template, pattern) {

a/test/unit/string.html

@@ -277 +277 @@
-        'a<a href="blah">blub</a>b<span><div></div></span>cdef<strong>!!!!</strong>g'.unescapeHTML());
-      
-      this.assertEqual(largeTextUnescaped, largeTextEscaped.unescapeHTML());
-
+
+
-      this.assertEqual('1\n2', '1\n2'.unescapeHTML());
-
+
+
+
+
-      
-      this.benchmark(function() { largeTextEscaped.unescapeHTML() }, 1000);
-