From bf3f6bb41f0d40494c94dda019253e27fedb5db3 Mon Sep 17 00:00:00 2001 From: Dario Solera Date: Wed, 27 Oct 2010 19:54:45 +0000 Subject: [PATCH] Fixed and closed #561: BMP images are now properly displayed in editor popup. --- AssemblyVersion.cs | 4 ++-- WebApplication/Popup.aspx.cs | 2 +- WebApplication/PopupWYSIWYG.aspx.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index 33334d7..af1de8a 100644 --- a/AssemblyVersion.cs +++ b/AssemblyVersion.cs @@ -16,5 +16,5 @@ using System.Reflection; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.0.4.560")] -[assembly: AssemblyFileVersion("3.0.4.560")] \ No newline at end of file +[assembly: AssemblyVersion("3.0.4.561")] +[assembly: AssemblyFileVersion("3.0.4.561")] \ No newline at end of file diff --git a/WebApplication/Popup.aspx.cs b/WebApplication/Popup.aspx.cs index 85ffa33..2ad0579 100644 --- a/WebApplication/Popup.aspx.cs +++ b/WebApplication/Popup.aspx.cs @@ -291,7 +291,7 @@ namespace ScrewTurn.Wiki { private bool IsImage(string name) { string ext = System.IO.Path.GetExtension(name.ToLowerInvariant()); - return ext == ".jpg" || ext == ".jpeg" || ext == ".gif" || ext == ".png" || ext == ".tif" || ext == ".tiff"; + return ext == ".jpg" || ext == ".jpeg" || ext == ".gif" || ext == ".png" || ext == ".tif" || ext == ".tiff" || ext == ".bmp"; } protected void lstProviderImages_SelectedIndexChanged(object sender, EventArgs e) { diff --git a/WebApplication/PopupWYSIWYG.aspx.cs b/WebApplication/PopupWYSIWYG.aspx.cs index 09210b9..fa77147 100644 --- a/WebApplication/PopupWYSIWYG.aspx.cs +++ b/WebApplication/PopupWYSIWYG.aspx.cs @@ -290,7 +290,7 @@ namespace ScrewTurn.Wiki { private bool IsImage(string name) { string ext = System.IO.Path.GetExtension(name.ToLowerInvariant()); - return ext == ".jpg" || ext == ".jpeg" || ext == ".gif" || ext == ".png" || ext == ".tif" || ext == ".tiff"; + return ext == ".jpg" || ext == ".jpeg" || ext == ".gif" || ext == ".png" || ext == ".tif" || ext == ".tiff" || ext == ".bmp"; } protected void lstProviderImages_SelectedIndexChanged(object sender, EventArgs e) {