Escape HTML uses &esamattis#39; instead of '

Closes esamattis#153
edtsech · Nov 2, 2012 · 1f986aa · 1f986aa
1 parent 9df4736
commit 1f986aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/underscore.string.js b/lib/underscore.string.js
@@ -41,12 +41,13 @@
     lt: '<',
     gt: '>',
     quot: '"',
-    apos: "'",
-    amp: '&'
+    amp: '&',
+    apos: "'"
   };
 
   var reversedEscapeChars = {};
-  for(var key in escapeChars){ reversedEscapeChars[escapeChars[key]] = key; }
+  for(var key in escapeChars) reversedEscapeChars[escapeChars[key]] = key;
+  reversedEscapeChars["'"] = '#39';
 
   // sprintf() for JavaScript 0.7-beta1
   // http://www.diveintojavascript.com/projects/javascript-sprintf

diff --git a/test/strings.js b/test/strings.js
@@ -362,7 +362,7 @@ $(document).ready(function() {
 
   test('String: escapeHTML', function(){
     equal(_('<div>Blah & "blah" & \'blah\'</div>').escapeHTML(),
-             '&lt;div&gt;Blah &amp; &quot;blah&quot; &amp; &apos;blah&apos;&lt;/div&gt;');
+             '&lt;div&gt;Blah &amp; &quot;blah&quot; &amp; &#39;blah&#39;&lt;/div&gt;');
     equal(_('&lt;').escapeHTML(), '&amp;lt;');
     equal(_(5).escapeHTML(), '5');
     equal(_('').escapeHTML(), '');
@@ -371,9 +371,10 @@ $(document).ready(function() {
   });
 
   test('String: unescapeHTML', function(){
-    equal(_('&lt;div&gt;Blah &amp; &quot;blah&quot; &amp; &apos;blah&apos;&lt;/div&gt;').unescapeHTML(),
+    equal(_('&lt;div&gt;Blah &amp; &quot;blah&quot; &amp; &apos;blah&#39;&lt;/div&gt;').unescapeHTML(),
              '<div>Blah & "blah" & \'blah\'</div>');
     equal(_('&amp;lt;').unescapeHTML(), '&lt;');
+    equal(_('&apos;').unescapeHTML(), '\'');
     equal(_('&#39;').unescapeHTML(), '\'');
     equal(_('&#0039;').unescapeHTML(), '\'');
     equal(_('&#x4a;').unescapeHTML(), 'J');