From e9b468f3c3b370790d6a431a33536c6e8dec32e0 Mon Sep 17 00:00:00 2001
From: benweet <benoit.schweblin@gmail.com>
Date: Mon, 23 Dec 2013 23:15:47 +0100
Subject: [PATCH] Support for GFM newlines and strikethrough

---
 public/res/extensions/markdownExtra.js        |  6 +++
 .../res/extensions/markdownSectionParser.js   |  7 +---
 .../res/html/markdownExtraSettingsBlock.html  | 38 ++++++++++++++-----
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/public/res/extensions/markdownExtra.js b/public/res/extensions/markdownExtra.js
index b3e2678e..ff13c4c4 100644
--- a/public/res/extensions/markdownExtra.js
+++ b/public/res/extensions/markdownExtra.js
@@ -20,6 +20,8 @@ define([
             "attr_list",
             "footnotes",
             "smartypants",
+            "strikethrough",
+            "newlines",
         ],
         highlighter: "prettify"
     };
@@ -36,6 +38,8 @@ define([
         utils.setInputChecked("#input-markdownextra-attrlist", hasExtension("attr_list"));
         utils.setInputChecked("#input-markdownextra-footnotes", hasExtension("footnotes"));
         utils.setInputChecked("#input-markdownextra-smartypants", hasExtension("smartypants"));
+        utils.setInputChecked("#input-markdownextra-strikethrough", hasExtension("strikethrough"));
+        utils.setInputChecked("#input-markdownextra-newlines", hasExtension("newlines"));
         utils.setInputValue("#input-markdownextra-highlighter", markdownExtra.config.highlighter);
     };
 
@@ -47,6 +51,8 @@ define([
         utils.getInputChecked("#input-markdownextra-attrlist") && newConfig.extensions.push("attr_list");
         utils.getInputChecked("#input-markdownextra-footnotes") && newConfig.extensions.push("footnotes");
         utils.getInputChecked("#input-markdownextra-smartypants") && newConfig.extensions.push("smartypants");
+        utils.getInputChecked("#input-markdownextra-strikethrough") && newConfig.extensions.push("strikethrough");
+        utils.getInputChecked("#input-markdownextra-newlines") && newConfig.extensions.push("newlines");
         newConfig.highlighter = utils.getInputValue("#input-markdownextra-highlighter");
     };
 
diff --git a/public/res/extensions/markdownSectionParser.js b/public/res/extensions/markdownSectionParser.js
index 7366b356..f2a5f974 100644
--- a/public/res/extensions/markdownSectionParser.js
+++ b/public/res/extensions/markdownSectionParser.js
@@ -39,7 +39,7 @@ define([
                 var sectionText = tmpText.substring(offset, endOffset);
                 sectionList.push({
                     text: sectionText,
-                    textWithDelimiter: '\n~~~SectionDelimiter~~~\n\n' + sectionText + '\n'
+                    textWithDelimiter: '\n<div class="se-section-delimiter"></div>\n\n' + sectionText + '\n'
                 });
             }
             var sectionList = [], offset = 0;
@@ -56,11 +56,6 @@ define([
                 return result + section.textWithDelimiter;
             }, '');
         });
-        
-        converter.hooks.chain("postConversion", function(text) {
-            // Convert delimiters into hidden elements
-            return text.replace(/<p>~~~SectionDelimiter~~~<\/p>/g, '<div class="se-section-delimiter"></div>');
-        });
     };
 
     return markdownSectionParser;
diff --git a/public/res/html/markdownExtraSettingsBlock.html b/public/res/html/markdownExtraSettingsBlock.html
index 5b65213f..f07b10ac 100644
--- a/public/res/html/markdownExtraSettingsBlock.html
+++ b/public/res/html/markdownExtraSettingsBlock.html
@@ -1,15 +1,5 @@
 <p>Adds extra features to the original Markdown syntax.</p>
 <div class="form-horizontal">
-	<div class="form-group">
-		<label class="col-lg-4 control-label"
-			for="input-markdownextra-fencedcodegfm">GFM fenced code
-			blocks</label>
-		<div class="col-lg-7">
-			<div class="checkbox">
-				<input type="checkbox" id="input-markdownextra-fencedcodegfm">
-			</div>
-		</div>
-	</div>
 	<div class="form-group">
 		<label class="col-lg-4 control-label" for="input-markdownextra-tables">Tables</label>
 		<div class="col-lg-7">
@@ -54,6 +44,34 @@
 			</div>
 		</div>
 	</div>
+	<div class="form-group">
+		<label class="col-lg-4 control-label"
+			for="input-markdownextra-newlines">GFM newlines</label>
+		<div class="col-lg-7">
+			<div class="checkbox">
+				<input type="checkbox" id="input-markdownextra-newlines">
+			</div>
+		</div>
+	</div>
+	<div class="form-group">
+		<label class="col-lg-4 control-label"
+			for="input-markdownextra-strikethrough">GFM strikethrough</label>
+		<div class="col-lg-7">
+			<div class="checkbox">
+				<input type="checkbox" id="input-markdownextra-strikethrough">
+			</div>
+		</div>
+	</div>
+	<div class="form-group">
+		<label class="col-lg-4 control-label"
+			for="input-markdownextra-fencedcodegfm">GFM fenced code
+			blocks</label>
+		<div class="col-lg-7">
+			<div class="checkbox">
+				<input type="checkbox" id="input-markdownextra-fencedcodegfm">
+			</div>
+		</div>
+	</div>
 	<div class="form-group">
 		<label class="col-lg-4 control-label"
 			for="input-markdownextra-highlighter">Syntax highlighter</label>