@@ -83,14 +83,16 @@ Object.extend(String.prototype, {
escapeHTML: function() {
var self = arguments.callee;
self.text.data = this;
- return self.div.innerHTML;
+ return self.container.innerHTML;
},
unescapeHTML: function() {
var div = new Element('div');
- div.innerHTML = this.stripTags();
+ // Safari requires the text nested inside another element to render correctly
+ div.innerHTML = '<pre>' + this.stripTags() + '</pre>';
+ div = div.firstChild;
return div.childNodes[0] ? (div.childNodes.length > 1 ?
- $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
+ $A(div.childNodes).inject('', function(memo, node) { return memo + node.nodeValue }) :
div.childNodes[0].nodeValue) : '';
},
@@ -211,15 +213,6 @@ Object.extend(String.prototype, {
}
});
-if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
- escapeHTML: function() {
- return this.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
- },
- unescapeHTML: function() {
- return this.stripTags().replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
- }
-});
-
String.prototype.gsub.prepareReplacement = function(replacement) {
if (Object.isFunction(replacement)) return replacement;
var template = new Template(replacement);
@@ -229,11 +222,39 @@ String.prototype.gsub.prepareReplacement = function(replacement) {
String.prototype.parseQuery = String.prototype.toQueryParams;
Object.extend(String.prototype.escapeHTML, {
- div: document.createElement('div'),
+ container: document.createElement('pre'),
text: document.createTextNode('')
});
-String.prototype.escapeHTML.div.appendChild(String.prototype.escapeHTML.text);
+String.prototype.escapeHTML.container.appendChild(String.prototype.escapeHTML.text);
+
+if (Prototype.Browser.IE)
+ // IE converts all newlines to carriage returns so we swap them back
+ String.prototype.unescapeHTML = String.prototype.unescapeHTML.wrap(function(proceed) {
+ return proceed().replace(/\r/g, '\n')
+ });
+
+if (Prototype.Browser.WebKit && Prototype.BrowserFeatures.SelectorsAPI)
+ // Safari 3.x has issues with escaping the ">" character
+ (function() {
+ var escapeHTML = String.prototype.escapeHTML;
+ Object.extend(
+ String.prototype.escapeHTML = escapeHTML.wrap(function(proceed) {
+ return proceed().replace(/>/g, ">")
+ }), {
+ container: escapeHTML.container,
+ text: escapeHTML.text
+ })
+ })();
+
+if ('&'.escapeHTML() !== '&') {
+ // Safari 2.x has issues with escaping html inside a "pre" element so we use the deprecated "xmp" element instead
+ Object.extend(String.prototype.escapeHTML, {
+ container: document.createElement('xmp'),
+ text: document.createTextNode('')
+ });
+ String.prototype.escapeHTML.container.appendChild(String.prototype.escapeHTML.text);
+}
var Template = Class.create({
initialize: function(template, pattern) {
src/string.js
@@ -255,9 +255,13 @@ new Test.Unit.Runner({
this.assertEqual(largeTextUnescaped, largeTextEscaped.unescapeHTML());
+ this.assertEqual('test \xfa', 'test ú'.unescapeHTML());
this.assertEqual('1\n2', '1\n2'.unescapeHTML());
this.assertEqual('Pride & Prejudice', '<h1>Pride & Prejudice</h1>'.unescapeHTML());
+ var escapedTest = '"<" means "<" in HTML';
+ this.assertEqual(escapedTest, escapedTest.escapeHTML().unescapeHTML());
+
this.benchmark(function() { largeTextEscaped.unescapeHTML() }, 1000);
},
test/unit/string_test.js
7a1ee73953690cc420d4887b2214bb07534f2ca3
jdalton
john.david.dalton@gmail.com
http://github.com/sstephenson/prototype/commit/57a901febacfd831bdb6c9b5b95753f4d256a65b
57a901febacfd831bdb6c9b5b95753f4d256a65b
2008-05-19T15:09:56-07:00
2008-04-25T12:18:09-07:00
Fix String#escapeHTML and String#unescapeHTML (to ensure no memory leakage and more consistent output). [#47:resolved]
1b60e48b5c8e0548f3c15f130e0cb281721420e5
Andrew Dupont
prototype@andrewdupont.net