Merge pull request #102 from milkshakesoftware/doctype-issue

martinnormark · martinnormark · commit b8d293b013db · 2016-04-15T22:26:59.000+02:00
Preserve original DOCTYPE Closes #38 Closes #97 Closes #101
diff --git a/PreMailer.Net/PreMailer.Net.Tests/PreMailerTests.cs b/PreMailer.Net/PreMailer.Net.Tests/PreMailerTests.cs
@@ -418,5 +418,15 @@ @keyframes mymove {
 
 			Assert.IsTrue(premailedOutput.Html.Contains("<div class=\"test\" style=\"background-color: #f1f1f1\""));
 		}
+
+		[TestMethod]
+		public void MoveCSSInline_PreservesDocType()
+		{
+			string input = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\"><html xmlns=\"http://www.w3.org/1999/xhtml\"><head></head><body></body></html>";
+
+			var premailedOutput = PreMailer.MoveCssInline(input, false);
+
+			Assert.IsTrue(premailedOutput.Html.StartsWith("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\"><html xmlns=\"http://www.w3.org/1999/xhtml\">"));
+		}
 	}
 }
diff --git a/PreMailer.Net/PreMailer.Net/PreMailer.cs b/PreMailer.Net/PreMailer.Net/PreMailer.cs
@@ -119,7 +119,8 @@ public InlineResult MoveCssInline(bool removeStyleElements = false, string ignor
 				}
 			}
 
-			var html = _document.DocumentElement.OuterHtml;
+			var html = _document.ToHtml();
+
 			return new InlineResult(html, _warnings);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -418,5 +418,15 @@ @keyframes mymove {`
`418`	`418`
`419`	`419`	`Assert.IsTrue(premailedOutput.Html.Contains("<div class=\"test\" style=\"background-color: #f1f1f1\""));`
`420`	`420`	`}`
	`421`	`+`
	`422`	`+ [TestMethod]`
	`423`	`+ public void MoveCSSInline_PreservesDocType()`
	`424`	`+ {`
	`425`	`+ string input = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\"><html xmlns=\"http://www.w3.org/1999/xhtml\"><head></head><body></body></html>";`
	`426`	`+`
	`427`	`+ var premailedOutput = PreMailer.MoveCssInline(input, false);`
	`428`	`+`
	`429`	`+ Assert.IsTrue(premailedOutput.Html.StartsWith("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\"><html xmlns=\"http://www.w3.org/1999/xhtml\">"));`
	`430`	`+ }`
`421`	`431`	`}`
`422`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,8 @@ public InlineResult MoveCssInline(bool removeStyleElements = false, string ignor`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`		`- var html = _document.DocumentElement.OuterHtml;`
	`122`	`+ var html = _document.ToHtml();`
	`123`	`+`
`123`	`124`	`return new InlineResult(html, _warnings);`
`124`	`125`	`}`
`125`	`126`