From d844195be137d6e67fd7eace5ad4d5f1310e7401 Mon Sep 17 00:00:00 2001
From: Hakim El Hattab <hakim.elhattab@gmail.com>
Date: Mon, 28 Oct 2013 09:06:43 -0400
Subject: [PATCH] format tweaks markdown.js, remove extra image asset

---
 plugin/markdown/markdown.js                |  30 ++++++++++++---------
 test/red-curtain-50x50.jpg                 | Bin 1995 -> 0 bytes
 test/test-element-attributes-markdown.html |  12 ++++-----
 3 files changed, 22 insertions(+), 20 deletions(-)
 delete mode 100644 test/red-curtain-50x50.jpg

diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index fccc4420..d6c6c459 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -28,7 +28,7 @@
 
 	var DEFAULT_SLIDE_SEPARATOR = '^\n---\n$',
 		DEFAULT_NOTES_SEPARATOR = 'note:';
-		DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '{\\\.\s*?([^}]+?)}';
+		DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '{_\s*?([^}]+?)}';
 
 
 	/**
@@ -277,46 +277,50 @@
 	 * directly on refresh (F5)
 	 * http://stackoverflow.com/questions/5690269/disabling-chrome-cache-for-website-development/7000899#answer-11786277
 	 */
-	function addAttributeInElement( node, elementTarget, separator ){
+	function addAttributeInElement( node, elementTarget, separator ) {
+
 		var mardownClassesInElementsRegex = new RegExp( separator, 'mg' );
 		var mardownClassRegex = new RegExp( "([^\"= ]+?)=\"([^\"=]+?)\"", 'mg' );
 		var nodeValue = node.nodeValue;
-		if ( matches = mardownClassesInElementsRegex.exec( nodeValue ) ) {
+		if( matches = mardownClassesInElementsRegex.exec( nodeValue ) ) {
 
 			var classes = matches[1];
 			nodeValue = nodeValue.substring( 0, matches.index ) + nodeValue.substring( mardownClassesInElementsRegex.lastIndex );
 			node.nodeValue = nodeValue;
 
 			while( matchesClass = mardownClassRegex.exec( classes ) ) {
-				elementTarget.setAttribute(matchesClass[1], matchesClass[2]);
+				elementTarget.setAttribute( matchesClass[1], matchesClass[2] );
 			}
 		}
+
 	}
 
 	/**
 	 * Add attributes to the parent element of a text node,
 	 * or the element of an attribute node.
 	 */
-	function addAttributes( element, separator )
-	{
-		if ( element.childNodes.length > 0 ) {
+	function addAttributes( element, separator ) {
 
-			for ( var i = 0; i < element.childNodes.length; i++ ) {
+		if( element.childNodes.length > 0 ) {
+			for( var i = 0; i < element.childNodes.length; i++ ) {
 				addAttributes( element.childNodes[i], separator );
 			}
 		}
+
 		var nodeValue;
 		var elementTarget;
+
 		// From http://stackoverflow.com/questions/9178174/find-all-text-nodes
-		if ( element.nodeType == Node.TEXT_NODE && /\S/.test(element.nodeValue) ) {
+		if( element.nodeType == Node.TEXT_NODE && /\S/.test(element.nodeValue) ) {
 			addAttributeInElement( element, element.parentNode, separator );
 		}
-		if ( element.nodeType == Node.ELEMENT_NODE && element.attributes.length > 0 ) {
-			for ( iattr=0; iattr<element.attributes.length; iattr++ ){
-				var attr = element.attributes[iattr];
-				addAttributeInElement(attr, element, separator )
+		if( element.nodeType == Node.ELEMENT_NODE && element.attributes.length > 0 ) {
+			for( var j = 0; j < element.attributes.length; j++ ){
+				var attr = element.attributes[j];
+				addAttributeInElement( attr, element, separator );
 			}
 		}
+
 	}
 
 	/**
diff --git a/test/red-curtain-50x50.jpg b/test/red-curtain-50x50.jpg
deleted file mode 100644
index ddfe7a637d747dedc7c7c71a01431e7e76e0eb6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1995
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

diff --git a/test/test-element-attributes-markdown.html b/test/test-element-attributes-markdown.html
index e547d161..b7ab0543 100644
--- a/test/test-element-attributes-markdown.html
+++ b/test/test-element-attributes-markdown.html
@@ -22,9 +22,7 @@
 				<!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-vertical="^\n\n"></section> -->
 
 				<!-- Slides are separated by newline + three dashes + newline, vertical slides identical but two dashes -->
-				<section	data-markdown data-separator="^\n---\n$" 
-						data-vertical="^\n--\n$"
-						data-element-attributes="{_\s*?([^}]+?)}">
+				<section data-markdown data-separator="^\n---\n$" data-vertical="^\n--\n$">
 					<script type="text/template">
 						## Slide 1.1 {_class="fragment fade-out" data-fragment-index="1"}
 
@@ -60,10 +58,10 @@
 						- list item 3  {_class="fragment highlight-green"}
 						- list item 4  {_class="fragment highlight-green"}
 						- list item 5  {_class="fragment highlight-green"}
-            
-Test
-            
-![Example Picture{_class="reveal stretch"}](red-curtain-50x50.jpg)
+
+						Test
+
+						![Example Picture{_class="reveal stretch"}](assets/image2.png)
 
 					</script>
 				</section>