Permalink
Browse files

Generate latest browser package

  • Loading branch information...
netzpirat committed Jul 18, 2012
1 parent 15c1f78 commit 4ccb3e26bd15abbf1eaa78dc7a45e4cec08c88a3
Showing with 4 additions and 4 deletions.
  1. +3 −3 dist/compiler/hamlcoffee.js
  2. +1 −1 dist/compiler/hamlcoffee.min.js
@@ -613,7 +613,7 @@ require.define("/haml-coffee.js", function (require, module, exports, __dirname,
if (this.options.customHtmlEscape) {
fn += "$e = " + this.options.customHtmlEscape + "\n";
} else {
- fn += "$e = (text, escape) ->\n \"\#{ text }\"\n .replace(/&/g, '&amp;')\n .replace(/</g, '&lt;')\n .replace(/>/g, '&gt;')\n .replace(/\'/g, '&apos;')\n .replace(/\"/g, '&quot;')\n";
+ fn += "$e = (text, escape) ->\n \"\#{ text }\"\n .replace(/&/g, '&amp;')\n .replace(/</g, '&lt;')\n .replace(/>/g, '&gt;')\n .replace(/\'/g, '&#39;')\n .replace(/\"/g, '&quot;')\n";
}
}
if (code.indexOf('$c') !== -1) {
@@ -1149,7 +1149,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
tag: tag.tag,
id: id,
classes: classes,
- text: tag.text,
+ text: escapeQuotes(tag.text),
attributes: attributes,
assignment: tag.assignment
};
@@ -1296,7 +1296,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
keys = /\(\s*([-\w]+[\w:-]*\w?)\s*=|\s+([-\w]+[\w:-]*\w?)\s*=|\(\s*('\w+[\w:-]*\w?')\s*=|\s+('\w+[\w:-]*\w?')\s*=|\(\s*("\w+[\w:-]*\w?")\s*=|\s+("\w+[\w:-]*\w?")\s*=/g;
break;
case '{':
- keys = /[{,]\s*(\w+[\w:-]*\w?):|[{,]\s*('[-\w]+[\w:-]*\w?'):|[{,]\s*("[-\w]+[\w:-]*\w?"):|[{,]\s*:(\w+[\w:-]*\w?)\s*=>|[{,]\s*:?'([-\w]+[\w:-]*\w?)'\s*=>|[{,]\s*:?"([-\w]+[\w:-]*\w?)"\s*=>/g;
+ keys = /[{,]\s*(\w+[\w:-]*\w?)\s*:|[{,]\s*('[-\w]+[\w:-]*\w?')\s*:|[{,]\s*("[-\w]+[\w:-]*\w?")\s*:|[{,]\s*:(\w+[\w:-]*\w?)\s*=>|[{,]\s*:?'([-\w]+[\w:-]*\w?)'\s*=>|[{,]\s*:?"([-\w]+[\w:-]*\w?)"\s*=>/g;
}
pairs = exp.split(keys).filter(Boolean);
inDataAttribute = false;
Oops, something went wrong.

0 comments on commit 4ccb3e2

Please sign in to comment.