Accept .ico file as image.

NuGet · Jan 8, 2013 · c5348bf · c5348bf
1 parent 54c3c98
commit c5348bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Website/Helpers/FileHelper.cs b/Website/Helpers/FileHelper.cs
@@ -13,12 +13,12 @@ public static class FileHelper
                                                                     ".DLL", ".EXE", ".WINMD", ".CHM", ".PDF",
                                                                     ".DOCX", ".DOC", ".RTF", ".PDB", ".ZIP", 
                                                                     ".RAR", ".XAP", ".VSIX", ".NUPKG", ".SNK", 
-                                                                    ".PFX", ".ICO"
+                                                                    ".PFX"
                                                                 };
 
         internal static readonly string[] ImageFileExtensions = new[]
                                                                 {
-                                                                    ".PNG", ".GIF", ".JPG", ".BMP", ".JPEG"
+                                                                    ".PNG", ".GIF", ".JPG", ".BMP", ".JPEG", ".ICO"
                                                                 };
 
         public static bool IsBinaryFile(string path)
@@ -38,6 +38,12 @@ public static string GetImageMimeType(string filePath)
             string extension = Path.GetExtension(filePath).ToLowerInvariant();
             if (ImageFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
             {
+                if (extension == ".ico")
+                {
+                    // IE will only render .ico file if the mime type is "image/x-icon"
+                    return "image/x-icon";
+                }
+
                 return "image/" + extension.Substring(1);	// omit the dot in front of extension
             }
 

diff --git a/Website/Views/PackageFiles/Contents.cshtml b/Website/Views/PackageFiles/Contents.cshtml
@@ -264,7 +264,7 @@
 
         function isImage(path) {
             var extension = getEffectiveExtension(path);
-            return extension == 'jpg' || path == 'gif' || extension == 'png' || extension == 'bmp' || extension == 'jpeg';
+            return extension == 'jpg' || path == 'gif' || extension == 'png' || extension == 'bmp' || extension == 'jpeg' || extension == 'ico';
         }
 
         function determineBrush(path) {