Merge pull request evilstreak#61 from bsstoner/master

ashb · ashb · commit f32b7be42c31 · 2012-09-01T09:42:23.000-07:00
Declared 'res' var locally so it isn't global
diff --git a/lib/markdown.js b/lib/markdown.js
@@ -1091,7 +1091,7 @@ Markdown.DialectHelpers.inline_until_char = function( text, want ) {
       return null;
     }
 
-    res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ) );
+    var res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ) );
     consumed += res[ 0 ];
     // Add any returned nodes.
     nodes.push.apply( nodes, res.slice( 1 ) );

Original file line number	Diff line number	Diff line change
`@@ -1091,7 +1091,7 @@ Markdown.DialectHelpers.inline_until_char = function( text, want ) {`
`1091`	`1091`	`return null;`
`1092`	`1092`	`}`
`1093`	`1093`
`1094`		`- res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ) );`
	`1094`	`+ var res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ) );`
`1095`	`1095`	`consumed += res[ 0 ];`
`1096`	`1096`	`// Add any returned nodes.`
`1097`	`1097`	`nodes.push.apply( nodes, res.slice( 1 ) );`