Merge pull request #198 from codekitchen/master

properly handle ampersands when HTML escaping
2012-09-14 20:48:40 -07:00
parent b83e5e0ea6 bd9a84a0b7
commit 26b1438f20
2 changed files with 4 additions and 1 deletions
@@ -22,6 +22,7 @@ Handlebars.SafeString.prototype.toString = function() {

 (function() {
  var escape = {
+    "&": "&amp;",
    "<": "&lt;",
    ">": "&gt;",
    '"': "&quot;",
@@ -29,7 +30,7 @@ Handlebars.SafeString.prototype.toString = function() {
    "`": "&#x60;"
  };

-  var badChars = /&(?!\w+;)|[<>"'`]/g;
+  var badChars = /[&<>"'`]/g;
  var possible = /[&<>"'`]/;

  var escapeChar = function(chr) {