Merge pull request #468 from trinketapp/master

Ability to provide a custom sanitize routine
markedjs · May 8, 2015 · e91a45c · e91a45c
2 parents 7ff2f1d + 55ea824
commit e91a45c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/marked.js b/lib/marked.js
@@ -356,10 +356,10 @@ Lexer.prototype.token = function(src, top, bq) {
     if (cap = this.rules.html.exec(src)) {
       src = src.substring(cap[0].length);
       this.tokens.push({
-        type: this.options.sanitize
+        type: this.options.sanitize && typeof(this.options.sanitize) !== 'function'
           ? 'paragraph'
           : 'html',
-        pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style',
+        pre: !this.options.sanitize && (cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style'),
         text: cap[0]
       });
       continue;
@@ -606,8 +606,10 @@ InlineLexer.prototype.output = function(src) {
       }
       src = src.substring(cap[0].length);
       out += this.options.sanitize
-        ? escape(cap[0])
-        : cap[0];
+        ? typeof(this.options.sanitize) === 'function'
+          ? this.options.sanitize(cap[0])
+          : escape(cap[0])
+        : cap[0]
       continue;
     }