Fix for issue #12, crash

toptensoftware · Feb 24, 2014 · 535c1f7 · 535c1f7
1 parent d4e6ea7
commit 535c1f7
Show file tree

Hide file tree

Showing 9 changed files with 435 additions and 418 deletions.
diff --git a/MarkdownDeepJS/MarkdownDeep.js b/MarkdownDeepJS/MarkdownDeep.js
@@ -2599,7 +2599,7 @@ var MarkdownDeep = new function () {
 
     p.ResolveHeaderID = function (m) {
         // Already resolved?
-        if (this.data != null)
+        if (typeof(this.data)=='string')
             return this.data;
 
         // Approach 1 - PHP Markdown Extra style header id

diff --git a/MarkdownDeepJS/MarkdownDeep.min.js b/MarkdownDeepJS/MarkdownDeep.min.js
diff --git a/MarkdownDeepJS/MarkdownDeepLib.min.js b/MarkdownDeepJS/MarkdownDeepLib.min.js
diff --git a/MarkdownDeepTests/JSTestResources/MarkdownDeep.js b/MarkdownDeepTests/JSTestResources/MarkdownDeep.js
@@ -2599,7 +2599,7 @@ var MarkdownDeep = new function () {
 
     p.ResolveHeaderID = function (m) {
         // Already resolved?
-        if (this.data != null)
+        if (typeof(this.data)=='string')
             return this.data;
 
         // Approach 1 - PHP Markdown Extra style header id

diff --git a/MarkdownDeepTests/JSTestResources/MarkdownDeep.min.js b/MarkdownDeepTests/JSTestResources/MarkdownDeep.min.js
diff --git a/MarkdownDeepTests/JSTestResources/MarkdownDeepLib.min.js b/MarkdownDeepTests/JSTestResources/MarkdownDeepLib.min.js
diff --git a/MarkdownDeepTests/MarkdownDeepTests.csproj b/MarkdownDeepTests/MarkdownDeepTests.csproj
@@ -411,6 +411,8 @@
     <Content Include="JSTestResources\MarkdownDeep.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <EmbeddedResource Include="testfiles\extramode\Issue12%28ExtraMode%29.txt" />
+    <EmbeddedResource Include="testfiles\extramode\Issue12%28ExtraMode%29.html" />
     <EmbeddedResource Include="testfiles\blocktests\PartiallyIndentedLists.html" />
     <EmbeddedResource Include="testfiles\blocktests\PartiallyIndentedLists.txt" />
     <EmbeddedResource Include="testfiles\blocktests\HtmlAttributeWithoutValue.txt" />

diff --git a/MarkdownDeepTests/testfiles/extramode/Issue12(ExtraMode).html b/MarkdownDeepTests/testfiles/extramode/Issue12(ExtraMode).html
@@ -0,0 +1,8 @@
+<dl>
+<dt>Term</dt>
+<dd>
+<p>Definition</p>
+</dd>
+</dl>
+<hr />
+<h1>Heading</h1>
diff --git a/MarkdownDeepTests/testfiles/extramode/Issue12(ExtraMode).txt b/MarkdownDeepTests/testfiles/extramode/Issue12(ExtraMode).txt
@@ -0,0 +1,7 @@
+Term
+
+: Definition
+
+***
+
+# Heading