Fixes for nested sites and prepare for version for release

Author: RobertHajbok

WebFormsDocumentViewer.Tests/DocumentViewerTests.cs

@@ -16,7 +16,7 @@ public void TempDirectoryPath_When_PathIsEmpty_Then_TempFolderIsSet()
             {
                 TempDirectoryPath = ""
             };
-            Assert.That(documentViewer.TempDirectoryPath, Is.EqualTo("Temp"));
+            Assert.That(documentViewer.TempDirectoryPath, Is.EqualTo("~/Temp"));
         }
 
         [Test]
@@ -26,7 +26,7 @@ public void BuildControl_When_ExtensionIsNotSupported_Then_DocumentIsNotDisplaye
             {
                 FilePath = ""
             };
-            Assert.That(documentViewer.BuildControl("", "", "", "", "").ToString(), Is.EqualTo(new StringBuilder("Cannot display document viewer").ToString()));
+            Assert.That(documentViewer.BuildControl("", "", "", "", "", "").ToString(), Is.EqualTo(new StringBuilder("Cannot display document viewer").ToString()));
         }
 
         [Test]
@@ -36,7 +36,7 @@ public void BuildControl_When_PdfJsIsUsed_Then_FilePathIsSetAccordingly()
             {
                 PdfRenderer = PdfRenderers.PdfJs
             };
-            Assert.That(documentViewer.BuildControl("", "sample.pdf", "", "", "").ToString().Contains("/Scripts/pdf.js/web/viewer.html?file=../../../"));
+            Assert.That(documentViewer.BuildControl("", "sample.pdf", "", "", "", "").ToString().Contains("Scripts/pdf.js/web/viewer.html?file="));
         }
 
         [Test]
@@ -47,7 +47,7 @@ public void BuildControl_When_NoErrorsOccur_Then_IFrameIsSetUp()
                 Width = Unit.Pixel(500),
                 Height = Unit.Pixel(500)
             };
-            Assert.That(documentViewer.BuildControl("", "sample.pdf", "", "", "").ToString(), Is.EqualTo("<iframe src=/sample.pdf width=500px height=500px></iframe>"));
+            Assert.That(documentViewer.BuildControl("", "sample.pdf", "", "", "", "").ToString(), Is.EqualTo("<iframe src=/sample.pdf width=500px height=500px></iframe>"));
         }
 
         [Test]
@@ -59,7 +59,7 @@ public void BuildControl_When_FileCannotBeConverted_Then_DocumentIsNotDisplayed(
                 FilePath = "sample.pptx",
                 TempDirectoryPath = "TmpFolder"
             };
-            Assert.That(documentViewer.BuildControl("", "sample.pptx", "", "", "").ToString(), Is.EqualTo(new StringBuilder("Cannot display document viewer").ToString()));
+            Assert.That(documentViewer.BuildControl("", "sample.pptx", "", "", "", "").ToString(), Is.EqualTo(new StringBuilder("Cannot display document viewer").ToString()));
         }
 
         [Test]

WebFormsDocumentViewer/DocumentViewer.cs

@@ -43,7 +43,7 @@ public string TempDirectoryPath
         {
             get
             {
-                return string.IsNullOrEmpty(tempDirectoryPath) ? "Temp" : tempDirectoryPath;
+                return string.IsNullOrEmpty(tempDirectoryPath) ? "~/Temp" : tempDirectoryPath;
             }
             set
             {
@@ -72,7 +72,7 @@ public override void RenderControl(HtmlTextWriter writer)
             try
             {
                 writer.Write(BuildControl(HttpContext.Current.Server.MapPath(FilePath), ResolveUrl(FilePath), HttpContext.Current.Server.MapPath(TempDirectoryPath),
-                    ResolveUrl(TempDirectoryPath), HttpContext.Current.Request.Url.GetLeftPart(UriPartial.Authority) + ResolveUrl("~/")).ToString());
+                    ResolveUrl(TempDirectoryPath), HttpContext.Current.Request.Url.GetLeftPart(UriPartial.Authority), ResolveUrl("~/")).ToString());
             }
             catch
             {
@@ -82,7 +82,7 @@ public override void RenderControl(HtmlTextWriter writer)
         }
 
         public StringBuilder BuildControl(string filePhysicalPath, string fileVirtualPath, string tempDirectoryPhysicalPath,
-            string tempDirectoryVirtualPath, string applicationRootUrl)
+            string tempDirectoryVirtualPath, string appDomain, string appRootUrl)
         {
             try
             {
@@ -100,9 +100,9 @@ public StringBuilder BuildControl(string filePhysicalPath, string fileVirtualPat
                 }
 
                 if (PdfRenderer == PdfRenderers.PdfJs && Enum.IsDefined(typeof(PdfJsSupportedExtensions), extension.ToString()))
-                    frameSource = string.Format("{0}/Scripts/pdf.js/web/viewer.html?file=../../../{1}", applicationRootUrl, frameSource);
+                    frameSource = string.Format("{0}{1}Scripts/pdf.js/web/viewer.html?file={0}{2}", appDomain, appRootUrl, frameSource);
                 else
-                    frameSource = string.Format("{0}/{1}", applicationRootUrl, frameSource);
+                    frameSource = string.Format("{0}/{1}", appDomain, frameSource);
 
                 StringBuilder sb = new StringBuilder();
                 sb.Append("<iframe src=" + frameSource + " ");

WebFormsDocumentViewer/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.8.0")]
-[assembly: AssemblyFileVersion("1.0.8.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]