From 80aadaf74e901b184d86b536c0c01e0fe98623d0 Mon Sep 17 00:00:00 2001
From: Gabriel Pillet
Date: Thu, 31 Oct 2013 14:02:34 +0100
Subject: Removing global flag for replacing whitespaces

---
 plugin/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugin/markdown/markdown.js')

diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index d6c6c45..23a3ed4 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -49,7 +49,7 @@
 			text = text.replace( new RegExp('\\n?\\t{' + leadingTabs + '}','g'), '\n' );
 		}
 		else if( leadingWs > 1 ) {
-			text = text.replace( new RegExp('\\n? {' + leadingWs + '}','g'), '\n' );
+			text = text.replace( new RegExp('\\n? {' + leadingWs + '}'), '\n' );
 		}
 
 		return text;
-- 
cgit v1.2.3


From 015468c3a2d1d4092f33920ac555a0e288e6213f Mon Sep 17 00:00:00 2001
From: Hakim El Hattab
Date: Mon, 17 Feb 2014 21:15:02 +0100
Subject: renamed markdown attributes for clarity and consistency:
 data-vertical -> data-separator-vertical, data-notes -> data-separator-notes

---
 README.md                                  |  6 +++---
 plugin/markdown/example.html               |  4 ++--
 plugin/markdown/markdown.js                | 10 +++++-----
 test/test-markdown-element-attributes.html |  8 ++++----
 test/test-markdown-slide-attributes.html   | 10 +++++-----
 test/test-markdown.html                    |  4 ++--
 6 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'plugin/markdown/markdown.js')

diff --git a/README.md b/README.md
index 8a37a0d..cbdb088 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,8 @@ When used locally, this feature requires that reveal.js [runs from a local web s
 ```html
 <section data-markdown="example.md"  
          data-separator="^\n\n\n"  
-         data-vertical="^\n\n"  
-         data-notes="^Note:"  
+         data-separator-vertical="^\n\n"  
+         data-separator-notes="^Note:"  
          data-charset="iso-8859-15">
 </section>
 ```
@@ -621,7 +621,7 @@ When used locally, this feature requires that reveal.js [runs from a local web s
 If you're using the external Markdown plugin, you can add notes with the help of a special delimiter:
 
 ```html
-<section data-markdown="example.md" data-separator="^\n\n\n" data-vertical="^\n\n" data-notes="^Note:"></section>
+<section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n" data-separator-notes="^Note:"></section>
 
 # Title
 ## Sub-title
diff --git a/plugin/markdown/example.html b/plugin/markdown/example.html
index 909639f..364e866 100644
--- a/plugin/markdown/example.html
+++ b/plugin/markdown/example.html
@@ -19,7 +19,7 @@
 			<div class="slides">
 
                 <!-- Use external markdown resource, separate slides by three newlines; vertical slides by two newlines -->
-                <section data-markdown="example.md" data-separator="^\n\n\n" data-vertical="^\n\n"></section>
+                <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n"></section>
 
                 <!-- Slides are separated by three dashes (quick 'n dirty regular expression) -->
                 <section data-markdown data-separator="---">
@@ -36,7 +36,7 @@
                 </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$">
+                <section data-markdown data-separator="^\n---\n$" data-separator-vertical="^\n--\n$">
                     <script type="text/template">
                         ## Demo 2
                         Slide 1.1
diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index 19aea28..9b0dae9 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -223,8 +223,8 @@
 
 							section.outerHTML = slidify( xhr.responseText, {
 								separator: section.getAttribute( 'data-separator' ),
-								verticalSeparator: section.getAttribute( 'data-vertical' ),
-								notesSeparator: section.getAttribute( 'data-notes' ),
+								verticalSeparator: section.getAttribute( 'data-separator-vertical' ),
+								notesSeparator: section.getAttribute( 'data-separator-notes' ),
 								attributes: getForwardedAttributes( section )
 							});
 
@@ -251,12 +251,12 @@
 				}
 
 			}
-			else if( section.getAttribute( 'data-separator' ) || section.getAttribute( 'data-vertical' ) || section.getAttribute( 'data-notes' ) ) {
+			else if( section.getAttribute( 'data-separator' ) || section.getAttribute( 'data-separator-vertical' ) || section.getAttribute( 'data-separator-notes' ) ) {
 
 				section.outerHTML = slidify( getMarkdownFromSlide( section ), {
 					separator: section.getAttribute( 'data-separator' ),
-					verticalSeparator: section.getAttribute( 'data-vertical' ),
-					notesSeparator: section.getAttribute( 'data-notes' ),
+					verticalSeparator: section.getAttribute( 'data-separator-vertical' ),
+					notesSeparator: section.getAttribute( 'data-separator-notes' ),
 					attributes: getForwardedAttributes( section )
 				});
 
diff --git a/test/test-markdown-element-attributes.html b/test/test-markdown-element-attributes.html
index b638082..27b888c 100644
--- a/test/test-markdown-element-attributes.html
+++ b/test/test-markdown-element-attributes.html
@@ -19,10 +19,10 @@
 
 			<div class="slides">
 
-				<!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-vertical="^\n\n"></section> -->
+				<!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-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-separator-vertical="^\n--\n$" data-element-attributes="{_\s*?([^}]+?)}">>
 					<script type="text/template">
 						## Slide 1.1
 						<!-- {_class="fragment fade-out" data-fragment-index="1"} -->
@@ -75,8 +75,8 @@
 
 
 				<section 	data-markdown data-separator="^\n\n\n"
-									data-vertical="^\n\n"
-									data-notes="^Note:"
+									data-separator-vertical="^\n\n"
+									data-separator-notes="^Note:"
 									data-charset="utf-8">
 					<script type="text/template">
 						# Test attributes in Markdown with default separator
diff --git a/test/test-markdown-slide-attributes.html b/test/test-markdown-slide-attributes.html
index 3b91784..bd7b28f 100644
--- a/test/test-markdown-slide-attributes.html
+++ b/test/test-markdown-slide-attributes.html
@@ -19,12 +19,12 @@
 
 			<div class="slides">
 
-				<!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-vertical="^\n\n"></section> -->
+				<!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n"></section> -->
 
 				<!-- Slides are separated by three lines, vertical slides by two lines, attributes are one any line starting with (spaces and) two dashes -->
 				<section 	data-markdown data-separator="^\n\n\n"
-									data-vertical="^\n\n"
-									data-notes="^Note:"
+									data-separator-vertical="^\n\n"
+									data-separator-notes="^Note:"
 									data-attributes="--\s(.*?)$"
 									data-charset="utf-8">
 					<script type="text/template">
@@ -56,8 +56,8 @@
 				</section>
 
 				<section 	data-markdown data-separator="^\n\n\n"
-									data-vertical="^\n\n"
-									data-notes="^Note:"
+									data-separator-vertical="^\n\n"
+									data-separator-notes="^Note:"
 									data-charset="utf-8">
 					<script type="text/template">
 						# Test attributes in Markdown with default separator
diff --git a/test/test-markdown.html b/test/test-markdown.html
index c89af30..901b2de 100644
--- a/test/test-markdown.html
+++ b/test/test-markdown.html
@@ -19,10 +19,10 @@
 
 			<div class="slides">
 
-				<!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-vertical="^\n\n"></section> -->
+				<!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-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$">
+				<section data-markdown data-separator="^\n---\n$" data-separator-vertical="^\n--\n$">
 					<script type="text/template">
 						## Slide 1.1
 
-- 
cgit v1.2.3


From 75247a88606b1ab2e2158fe476fbe53340dc4934 Mon Sep 17 00:00:00 2001
From: Sergey Gospodarets
Date: Wed, 2 Apr 2014 12:59:36 +0300
Subject: Mark xhr.status=0 as successful

---
 plugin/markdown/markdown.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'plugin/markdown/markdown.js')

diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index 19aea28..efec14e 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -219,7 +219,10 @@
 
 				xhr.onreadystatechange = function() {
 					if( xhr.readyState === 4 ) {
-						if ( xhr.status >= 200 && xhr.status < 300 ) {
+						if (
+                            (xhr.status >= 200 && xhr.status < 300) ||
+                            xhr.status === 0 // file protocol yields status code 0 (useful for local debug, mobile applications etc.)
+                            ) {
 
 							section.outerHTML = slidify( xhr.responseText, {
 								separator: section.getAttribute( 'data-separator' ),
-- 
cgit v1.2.3


From 873f2dbc96e712d1afbc2f197c8b60287d7f728c Mon Sep 17 00:00:00 2001
From: Sergey Gospodarets
Date: Wed, 2 Apr 2014 13:02:39 +0300
Subject: Mark xhr.status=0 as successful

---
 plugin/markdown/markdown.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugin/markdown/markdown.js')

diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index efec14e..6c27a13 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -220,9 +220,9 @@
 				xhr.onreadystatechange = function() {
 					if( xhr.readyState === 4 ) {
 						if (
-                            (xhr.status >= 200 && xhr.status < 300) ||
-                            xhr.status === 0 // file protocol yields status code 0 (useful for local debug, mobile applications etc.)
-                            ) {
+							(xhr.status >= 200 && xhr.status < 300) ||
+							xhr.status === 0 // file protocol yields status code 0 (useful for local debug, mobile applications etc.)
+							) {
 
 							section.outerHTML = slidify( xhr.responseText, {
 								separator: section.getAttribute( 'data-separator' ),
-- 
cgit v1.2.3


From c87d7db93064bac472e1cc80bee28c4dcc92565b Mon Sep 17 00:00:00 2001
From: Hakim El Hattab
Date: Sun, 6 Apr 2014 10:18:38 +0200
Subject: code format tweak

---
 plugin/markdown/markdown.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'plugin/markdown/markdown.js')

diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index 9c0c91a..9afee06 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -219,10 +219,8 @@
 
 				xhr.onreadystatechange = function() {
 					if( xhr.readyState === 4 ) {
-						if (
-							(xhr.status >= 200 && xhr.status < 300) ||
-							xhr.status === 0 // file protocol yields status code 0 (useful for local debug, mobile applications etc.)
-							) {
+						// file protocol yields status code 0 (useful for local debug, mobile applications etc.)
+						if ( ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status === 0 ) {
 
 							section.outerHTML = slidify( xhr.responseText, {
 								separator: section.getAttribute( 'data-separator' ),
-- 
cgit v1.2.3