Made updates as per Github issues

Fixed - #55 and #54
deanhume · Jul 24, 2024 · 46c4e9e · 46c4e9e
1 parent e3700d0
commit 46c4e9e
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 13 deletions.
diff --git a/HtmlMinifier.Tests/Data/GithubIssue54.txt b/HtmlMinifier.Tests/Data/GithubIssue54.txt
@@ -0,0 +1,4 @@
+<input
+  type="file"
+  id="docpicker"
+  accept="application/pdf,image/*" />
diff --git a/HtmlMinifier.Tests/Data/GithubIssue54Result.txt b/HtmlMinifier.Tests/Data/GithubIssue54Result.txt
@@ -0,0 +1 @@
+<input type="file" id="docpicker" accept="application/pdf,image/*" />
diff --git a/HtmlMinifier.Tests/DataHelpers.cs b/HtmlMinifier.Tests/DataHelpers.cs
@@ -108,5 +108,8 @@ public static class DataHelpers
 
         public static string GithubIssue44 = "<h4> <i class=\"fa fa-play-circle-o\"> </i>Xem gì hôm nay?</h4>";
         public static string GithubIssue44Result = "<h4><i class=\"fa fa-play-circle-o\"></i>Xem gì hôm nay?</h4>";
+
+        public static string GithubIssue54 = "<input\r\n  type=\"file\"\r\n  id=\"docpicker\"\r\n  accept=\"application/pdf,image/*\" />";
+        public static string GithubIssue54Result = "<input type=\"file\" id=\"docpicker\" accept=\"application/pdf,image/*\" />";
     }
 }
diff --git a/HtmlMinifier.Tests/HtmlMinifier.Tests.csproj b/HtmlMinifier.Tests/HtmlMinifier.Tests.csproj
@@ -95,6 +95,8 @@
     <Content Include="Data\GithubIssue10Result.txt" />
     <Content Include="Data\GithubIssue13.txt" />
     <Content Include="Data\GithubIssue13Result.txt" />
+    <Content Include="Data\GithubIssue54.txt" />
+    <Content Include="Data\GithubIssue54Result.txt" />
     <Content Include="Data\LanguageSpecificCharacters.txt" />
     <Content Include="Data\LanguageSpecificCharactersResult.txt" />
     <Content Include="Data\ModelList.txt" />

diff --git a/HtmlMinifier.Tests/MinificationTests.cs b/HtmlMinifier.Tests/MinificationTests.cs
@@ -271,5 +271,18 @@ public void GithubIssue44_ShouldReturnCorrectly()
             // Assert
             Assert.AreEqual(minifiedHtml, expectedResult);
         }
+
+        [TestMethod]
+        public void GithubIssue54_ShouldReturnCorrectly()
+        {
+            // Arrange
+            string expectedResult = DataHelpers.GithubIssue54Result;
+
+            // Act
+            string minifiedHtml = StreamReaderExtension.MinifyHtmlCode(DataHelpers.GithubIssue54, noFeatures);
+
+            // Assert
+            Assert.AreEqual(minifiedHtml, expectedResult);
+        }
     }
 }
diff --git a/HtmlMinifier.Tests/Properties/AssemblyInfo.cs b/HtmlMinifier.Tests/Properties/AssemblyInfo.cs
@@ -3,11 +3,11 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("HtmlMinifier.Tests")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Test suite for HtmlMinifier")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HtmlMinifier.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyCopyright("Copyright ©  2022 - 2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -16,5 +16,5 @@
 [assembly: Guid("206365fc-84f9-49ae-8970-ed31b2b5b42b")]
 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]
diff --git a/HtmlMinifier.sln b/HtmlMinifier.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29215.179
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35027.167
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlMinifier", "ViewMinifier\HtmlMinifier.csproj", "{339A7163-32AC-413A-BF8F-EB30E8B5C136}"
 EndProject
@@ -10,17 +10,27 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{339A7163-32AC-413A-BF8F-EB30E8B5C136}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{339A7163-32AC-413A-BF8F-EB30E8B5C136}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{339A7163-32AC-413A-BF8F-EB30E8B5C136}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{339A7163-32AC-413A-BF8F-EB30E8B5C136}.Debug|x64.Build.0 = Debug|Any CPU
 		{339A7163-32AC-413A-BF8F-EB30E8B5C136}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{339A7163-32AC-413A-BF8F-EB30E8B5C136}.Release|Any CPU.Build.0 = Release|Any CPU
+		{339A7163-32AC-413A-BF8F-EB30E8B5C136}.Release|x64.ActiveCfg = Release|x64
+		{339A7163-32AC-413A-BF8F-EB30E8B5C136}.Release|x64.Build.0 = Release|x64
 		{206365FC-84F9-49AE-8970-ED31B2B5B42B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{206365FC-84F9-49AE-8970-ED31B2B5B42B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{206365FC-84F9-49AE-8970-ED31B2B5B42B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{206365FC-84F9-49AE-8970-ED31B2B5B42B}.Debug|x64.Build.0 = Debug|Any CPU
 		{206365FC-84F9-49AE-8970-ED31B2B5B42B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{206365FC-84F9-49AE-8970-ED31B2B5B42B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{206365FC-84F9-49AE-8970-ED31B2B5B42B}.Release|x64.ActiveCfg = Release|Any CPU
+		{206365FC-84F9-49AE-8970-ED31B2B5B42B}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/ViewMinifier/HtmlMinifier.csproj b/ViewMinifier/HtmlMinifier.csproj
@@ -12,6 +12,9 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -26,9 +29,6 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -49,6 +49,28 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/ViewMinifier/Program.cs b/ViewMinifier/Program.cs
@@ -11,7 +11,6 @@ namespace HtmlMinifier
     /// </summary>
     public class Program
     {
-
         static void Main(string[] args)
         {
             if (args.Length == 0)

diff --git a/ViewMinifier/Properties/AssemblyInfo.cs b/ViewMinifier/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HtmlMinifier")]
-[assembly: AssemblyCopyright("Copyright Dean Hume © 2014 - 2019")]
+[assembly: AssemblyCopyright("Copyright Dean Hume © 2014 - 2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.9.1.0")]
-[assembly: AssemblyFileVersion("1.9.1.0")]
+[assembly: AssemblyVersion("1.9.2.0")]
+[assembly: AssemblyFileVersion("1.9.2.0")]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<input type="file" id="docpicker" accept="application/pdf,image/*" />