From 6c3c0a5f6ccd2f9375c6d1ed8cf56409d0cab325 Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <erisds@gmail.com>
Date: Wed, 19 Mar 2014 23:22:36 +0000
Subject: [PATCH] Switch Showdown to fork

fixes #2312

- showdown fork understands more html tags
---
 bower.json                                 |  2 +-
 core/test/unit/client_showdown_int_spec.js | 24 +++++++++++++++++++++-
 package.json                               |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/bower.json b/bower.json
index d11105d4da..82f1728d57 100644
--- a/bower.json
+++ b/bower.json
@@ -14,7 +14,7 @@
         "lodash": "2.4.1",
         "moment": "2.4.0",
         "nprogress": "0.1.2",
-        "showdown": "0.3.1",
+        "showdown": "git://github.com/ErisDS/showdown.git#ghost",
         "validator-js": "3.4.0"
     }
 }
diff --git a/core/test/unit/client_showdown_int_spec.js b/core/test/unit/client_showdown_int_spec.js
index 0bc0d3bb05..6fbc8f71e8 100644
--- a/core/test/unit/client_showdown_int_spec.js
+++ b/core/test/unit/client_showdown_int_spec.js
@@ -212,7 +212,7 @@ describe("Showdown client side converter", function () {
         var testPhrases = [
                 {
                     input: "[Google][1]\n\n[1]: http://google.co.uk",
-                    output: /^<p><a href="http:\/\/google.co.uk">Google<\/a><\/p>$/,
+                    output: /^<p><a href="http:\/\/google.co.uk">Google<\/a><\/p>$/
                 },
                 {
                     input: "[Google][1]\n\n[1]: http://google.co.uk \"some text\"",
@@ -456,4 +456,26 @@ describe("Showdown client side converter", function () {
             processedMarkup.should.match(testPhrase.output);
         });
     });
+
+    it("should output block HTML untouched", function () {
+        var testPhrases = [
+            {
+                input: "<table class=\"test\">\n    <tr>\n        <td>Foo</td>\n    </tr>\n    <tr>\n        <td>Bar</td>\n    </tr>\n</table>",
+                output: /^<table class=\"test\">  \n    <tr>\n        <td>Foo<\/td>\n    <\/tr>\n    <tr>\n        <td>Bar<\/td>\n    <\/tr>\n<\/table>$/
+            },
+            {
+                input: "<hr />",
+                output: /^<hr \/>$/
+            },
+            {   // audio isn't counted as a block tag by showdown so gets wrapped in <p></p>
+                input: "<audio class=\"podcastplayer\" controls>\n    <source src=\"foobar.mp3\" type=\"audio/mp3\" preload=\"none\"></source>\n    <source src=\"foobar.off\" type=\"audio/ogg\" preload=\"none\"></source>\n</audio>",
+                output: /^<audio class=\"podcastplayer\" controls>  \n    <source src=\"foobar.mp3\" type=\"audio\/mp3\" preload=\"none\"><\/source>\n    <source src=\"foobar.off\" type=\"audio\/ogg\" preload=\"none\"><\/source>\n<\/audio>$/,
+            }
+        ];
+
+        testPhrases.forEach(function (testPhrase) {
+            processedMarkup = converter.makeHtml(testPhrase.input);
+            processedMarkup.should.match(testPhrase.output);
+        });
+    });
 });
diff --git a/package.json b/package.json
index e7064beaa1..f753a07a85 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
         "nodemailer": "0.5.13",
         "rss": "0.2.1",
         "semver": "2.2.1",
-        "showdown": "0.3.1",
+        "showdown": "git://github.com/ErisDS/showdown.git#ghost",
         "sqlite3": "2.2.0",
         "unidecode": "0.1.3",
         "validator": "3.4.0",