From d44125d789a8d80beaf6426379c23270bee131d9 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 7 Jul 2015 12:15:43 +0200 Subject: [PATCH] tweaks for #1200 --- plugin/markdown/markdown.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index 14433e6..f4035e2 100755 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -31,6 +31,8 @@ DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '\\\.element\\\s*?(.+?)$', DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR = '\\\.slide:\\\s*?(\\\S.+?)$'; + var SCRIPT_END_PLACEHOLDER = '__SCRIPT_END__'; + /** * Retrieves the markdown contents of a slide section @@ -42,8 +44,10 @@ // strip leading whitespace so it isn't evaluated as code var text = ( template || section ).textContent; - // restore script end tag - text = text.replace(/__SCRIPT_END__/g, ''); + + // restore script end tags + text = text.replace( new RegExp( SCRIPT_END_PLACEHOLDER, 'g' ), '' ); + var leadingWs = text.match( /^\n?(\s*)/ )[1].length, leadingTabs = text.match( /^\n?(\t*)/ )[1].length; @@ -115,8 +119,11 @@ if( notesMatch.length === 2 ) { content = notesMatch[0] + ''; } - //handle script end tag bug - content = content.replace(/<\/script>/g, '__SCRIPT_END__'); + + // prevent script end tags in the content from interfering + // with parsing + content = content.replace( /<\/script>/g, SCRIPT_END_PLACEHOLDER ); + return ''; }