bugfixing

simonegli8 · May 4, 2013 · b20f757 · b20f757
1 parent ffcfc4d
commit b20f757
Show file tree

Hide file tree

Showing 29 changed files with 95 additions and 58 deletions.
diff --git a/XamlImageConverter.Exe/Program.cs b/XamlImageConverter.Exe/Program.cs
@@ -22,7 +22,7 @@ public class Program {
  }
 
  if (a.Count == 0 || new[] { "-h", "help", "-help", "?", "/?", "-?" }.Any(s => a.Any(at => s == at.Trim().ToLower()))) {
- Console.WriteLine("XamlImageConverter 3.7 by Chris Cavanagh & Simon Egli");
+ Console.WriteLine("XamlImageConverter 3.8 by Chris Cavanagh & Simon Egli");
  Console.WriteLine("Creates snapshots, gif animations or html image maps from XAML, SVG & PSD images\n\r");
  Console.Error.WriteLine("XamlImageConverter [-x] [-w] [-1] [-s [running time]] [-r] [-v]");
  Console.Error.WriteLine(" [-l librarypath] [-p projectpath] configFile { configFile }");

diff --git a/XamlImageConverter.Exe/Properties/AssemblyInfo.cs b/XamlImageConverter.Exe/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( "3.7.0.0" )]
-[assembly: AssemblyFileVersion( "3.7.0.0" )]
+[assembly: AssemblyVersion( "3.8.0.0" )]
+[assembly: AssemblyFileVersion( "3.8.0.0" )]
diff --git a/XamlImageConverter.ItemWizard/ItemWizard.cs b/XamlImageConverter.ItemWizard/ItemWizard.cs
@@ -275,15 +275,15 @@ public class ItemWizard: IWizard {
  var Silversite = File.Exists(Path.Combine(bin, "Silversite.Core.dll"));
  string binlazy;
  if (Silversite) binlazy = Path.Combine(dest, "Silversite\\Bin");
- else binlazy = Path.Combine(dest, "Bin.Lazy");
+ else binlazy = Path.Combine(bin, "Lazy");
  if (IsWeb && !Directory.Exists(binlazy)) {
  Directory.CreateDirectory(binlazy);
  Files.Copy(Path.Combine(src, "XamlImageConverter.dll"), binlazy);
  Files.Copy(Path.Combine(src, "XamlImageConverter.pdb"), binlazy);
- Files.Copy(Path.Combine(src, "Lazy\\gxps"), binlazy);
- Files.Copy(Path.Combine(src, "Lazy\\html2xaml"), binlazy);
- Files.Copy(Path.Combine(src, "Lazy\\ImageMagick"), binlazy);
- Files.Copy(Path.Combine(src, "Lazy\\psd2xaml"), binlazy);
+ Files.Copy(Path.Combine(src, "gxps"), binlazy);
+ Files.Copy(Path.Combine(src, "html2xaml"), binlazy);
+ Files.Copy(Path.Combine(src, "ImageMagick"), binlazy);
+ Files.Copy(Path.Combine(src, "psd2xaml"), binlazy);
  //var cache = Path.Combine(dest, "Images\\Cache");
  //if (!Directory.Exists(cache)) Directory.CreateDirectory(cache);
  }
@@ -323,7 +323,7 @@ public class ItemWizard: IWizard {
  if (configSections == null) webconfig.AddFirst(configSections = new XElement("configSections"));
 
  //configSections.Elements().Where(x => ((string)x.Attribute("type") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- configSections.Add(XElement.Parse("<section name='XamlImageConverter' type='XamlImageConverter.Configuration, XamlImageConverters.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
+ configSections.Add(XElement.Parse("<section name='XamlImageConverter' type='XamlImageConverter.Configuration, XamlImageConverters.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
  // XamlImageConverter section
  if (webconfig.Element("XamlImageConverter") == null) configSections.AddAfterSelf(XElement.Parse("<XamlImageConverter Log='true' Cache='~/Images/Cache' />"));
  }
@@ -334,11 +334,11 @@ public class ItemWizard: IWizard {
  var handlers = server.Element("handlers");
  if (handlers == null) server.Add(handlers = new XElement("handlers"));
  handlers.Elements().Where(x => ((string)x.Attribute("type") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- handlers.Add(XElement.Parse("<add name='XamlImageConverter.Xaml' verb='*' path='*.xaml' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Svg' verb='*' path='*.svg' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Svgz' verb='*' path='*.svgz' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Psd' verb='*' path='*.psd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Dynamic' verb='*' path='xic.axd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
+ handlers.Add(XElement.Parse("<add name='XamlImageConverter.Xaml' verb='*' path='*.xaml' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Svg' verb='*' path='*.svg' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Svgz' verb='*' path='*.svgz' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Psd' verb='*' path='*.psd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Dynamic' verb='*' path='xic.axd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
 
  // system.web
  var web = webconfig.Element("system.web");
@@ -350,15 +350,15 @@ public class ItemWizard: IWizard {
  var assemblies = comp.Element("assemblies");
  if (assemblies == null) comp.Add(assemblies = new XElement("assemblies"));
  assemblies.Elements().Where(x => ((string)x.Attribute("assembly") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- assemblies.Add(XElement.Parse("<add assembly='XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45'/>"));
+ assemblies.Add(XElement.Parse("<add assembly='XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45'/>"));
 
  // pages
  var pages = web.Element("pages");
  if (pages == null) comp.AddAfterSelf(pages = new XElement("pages"));
  var controls = pages.Element("controls");
  if (controls == null) pages.Add(controls = new XElement("controls"));
  controls.Elements().Where(x => ((string)x.Attribute("assembly") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- controls.Add(XElement.Parse("<add tagPrefix='xic' namespace='XamlImageConverter.Web.UI' assembly='XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
+ controls.Add(XElement.Parse("<add tagPrefix='xic' namespace='XamlImageConverter.Web.UI' assembly='XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
 
  /*
  // httpHandlers

diff --git a/XamlImageConverter.ItemWizard/XamlImageConverter.ItemWizard.csproj b/XamlImageConverter.ItemWizard/XamlImageConverter.ItemWizard.csproj
@@ -69,6 +69,9 @@
  <EmbedInteropTypes>True</EmbedInteropTypes>
  </Reference>
  <Reference Include="WindowsBase" />
+ <Reference Include="XamlImageConverter.Web">
+ <HintPath>..\..\homesell\homesell.ch\Bin\XamlImageConverter.Web.dll</HintPath>
+ </Reference>
  </ItemGroup>
  <ItemGroup>
  <Compile Include="Silversite\Files.cs" />

diff --git a/XamlImageConverter.Test.Web/Web.config b/XamlImageConverter.Test.Web/Web.config
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
  <configSections>
- <section name="XamlImageConverter" type="XamlImageConverter.Configuration, XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <section name="XamlImageConverter" type="XamlImageConverter.Configuration, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </configSections>
  <XamlImageConverter log="true" cache="~/Images/Cache" separateDomain="false"/>
  <appSettings/>
@@ -23,12 +23,12 @@
  -->
  <compilation debug="true" targetFramework="4.5">
  <assemblies>
- <add assembly="XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add assembly="XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </assemblies>
  </compilation>
  <pages controlRenderingCompatibilityVersion="4.0">
  <controls>
- <add tagPrefix="xic" namespace="Silversite.Web.UI" assembly="XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add tagPrefix="xic" namespace="XamlImageConverter.Web.UI" assembly="XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </controls>
  </pages>
  <!--
@@ -46,11 +46,11 @@
  -->
  <system.webServer>
  <handlers>
- <add name="XamlImageConverterXaml" verb="*" path="*.xaml" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterPsd" verb="*" path="*.svg" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterSvg" verb="*" path="*.svgz" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterSvgz" verb="*" path="*.psd" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterDynamic" verb="*" path="xic.axd" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.7.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterXaml" verb="*" path="*.xaml" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterPsd" verb="*" path="*.svg" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterSvg" verb="*" path="*.svgz" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterSvgz" verb="*" path="*.psd" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterDynamic" verb="*" path="xic.axd" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </handlers>
  <validation validateIntegratedModeConfiguration="false" />
  </system.webServer>

diff --git a/XamlImageConverter.Test.Web/XamlImageConverter.Demo/Readme.aspx b/XamlImageConverter.Test.Web/XamlImageConverter.Demo/Readme.aspx
@@ -171,6 +171,20 @@
  </script>
 
  </div>
+
+ <%--<h3>Map Element for a selectable map:</h3>
+ 
+ <pre><code>
+ &lt;xic:Map runat="server" Source="Usa.Map.svg" Scale="0.5" Mode="Select" CssClass="map" Legend="true" SubmitText="Submit" 
+ IDs="WA,OR,CA,AK,ID,NV,AZ,UT,MT,WY,CO,NM,TX,OK,KS,NE,SD,ND,MN,IA,MO,AR,LA,WI,IL,TN,MS,MI,IN,KY,AL,FL,GA,SC,NC,VA,WV,OH,PA,MD,NJ,NY,CT,MA,VT,NH,ME,RI,DE,HI"
+ Regions="Washington,Oregon,California,Arkansas,Utah,Montana,Wyoming,Colorado,New Mexico,Texas,Oklahoma,Kansas,Nebraska,South Dakota,North Dakota,Minnesota,Iowa,Mississippi,Michigan,Indiana,Kentucky,Alabama,Florida,Georgia,South Carolina,North Carolina,Virginia,West Virginia,Ohio,Pennsylvania,Maryland,New Jersey,New York,Connecticut,Massachusetts,Vermont,New Hampshire,Maine,Rhode Island, Delaware,Hawaii" /&gt;
+ 
+ </code></pre>
+
+ <xic:Map runat="server" Source="Usa.Map.svg" Scale="0.5" Mode="Select" CssClass="map" Legend="true" SubmitText="Submit" 
+ IDs="WA,OR,CA,AK,ID,NV,AZ,UT,MT,WY,CO,NM,TX,OK,KS,NE,SD,ND,MN,IA,MO,AR,LA,WI,IL,TN,MS,MI,IN,KY,AL,FL,GA,SC,NC,VA,WV,OH,PA,MD,NJ,NY,CT,MA,VT,NH,ME,RI,DE,HI"
+ Regions="Washington,Oregon,California,Arkansas,Utah,Montana,Wyoming,Colorado,New Mexico,Texas,Oklahoma,Kansas,Nebraska,South Dakota,North Dakota,Minnesota,Iowa,Mississippi,Michigan,Indiana,Kentucky,Alabama,Florida,Georgia,South Carolina,North Carolina,Virginia,West Virginia,Ohio,Pennsylvania,Maryland,New Jersey,New York,Connecticut,Massachusetts,Vermont,New Hampshire,Maine,Rhode Island, Delaware,Hawaii" />
+ --%>
  </form>
 </body>
 </html>
diff --git a/XamlImageConverter.VSIX/Templates/XamlImageConverterConfiguration.CSharp.zip b/XamlImageConverter.VSIX/Templates/XamlImageConverterConfiguration.CSharp.zip
diff --git a/XamlImageConverter.VSIX/Templates/XamlImageConverterConfiguration.VB.zip b/XamlImageConverter.VSIX/Templates/XamlImageConverterConfiguration.VB.zip
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.ItemWizard.dll b/XamlImageConverter.VSIX/XamlImageConverter.ItemWizard.dll
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.ItemWizard.pdb b/XamlImageConverter.VSIX/XamlImageConverter.ItemWizard.pdb
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.VSIX.csproj b/XamlImageConverter.VSIX/XamlImageConverter.VSIX.csproj
@@ -62,7 +62,6 @@
  </Content>
  <Content Include="Demo\Readme.aspx">
  <IncludeInVSIX>true</IncludeInVSIX>
- <SubType>ASPXCodeBehind</SubType>
  </Content>
  <Content Include="Demo\SiteSpecification.xml">
  <IncludeInVSIX>true</IncludeInVSIX>

diff --git a/XamlImageConverter.VSIX/XamlImageConverter.Web.dll b/XamlImageConverter.VSIX/XamlImageConverter.Web.dll
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.Web.pdb b/XamlImageConverter.VSIX/XamlImageConverter.Web.pdb
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.dll b/XamlImageConverter.VSIX/XamlImageConverter.dll
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.pdb b/XamlImageConverter.VSIX/XamlImageConverter.pdb
diff --git a/XamlImageConverter.VSIX/source.extension.vsixmanifest b/XamlImageConverter.VSIX/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
  <Identifier Id="XamlImageConverter.2c5e9477-428f-4362-a5b5-d8c2d6ec2605">
  <Name>Xaml Image Converter</Name>
  <Author>David Egli</Author>
- <Version>3.7</Version>
+ <Version>3.8</Version>
  <AllUsers>true</AllUsers>
  <Description xml:space="preserve">Renders images, animations, html image maps &amp; pdf's from Xaml, SVG &amp; Photoshop files.
 

diff --git a/XamlImageConverter.VSIX/xiconvert.exe b/XamlImageConverter.VSIX/xiconvert.exe
diff --git a/XamlImageConverter.VSIX/xiconvert.pdb b/XamlImageConverter.VSIX/xiconvert.pdb
diff --git a/XamlImageConverter.Web/Compiler.cs b/XamlImageConverter.Web/Compiler.cs
@@ -9,18 +9,19 @@ namespace XamlImageConverter.Web.UI {
 
  public class Compiler {
 
+ static object compiler = null;
+
  public static void Compile(string xic) {
- var checker = new XamlBuildCheck();
- object compiler = null;
+ var checker = new XamlBuildCheck() { Context = System.Web.HttpContext.Current };
+
  if (checker.NeedsBuilding(xic)) {
 #if Silversite
  var handlerInfo = Services.Lazy.Types.Info("XamlImageConverter.Compiler");
  handlerInfo.Load();
- compiler = handlerInfo.New();
+ Compiler = handlerInfo.New();
 #else
- var assemblyfile = HostingEnvironment.MapPath("~/Bin.Lazy/XamlImageConverter.dll");
+ var assemblyfile = HostingEnvironment.MapPath("~/Bin/Lazy/XamlImageConverter.dll");
  if (!System.IO.File.Exists(assemblyfile)) assemblyfile = HostingEnvironment.MapPath("~/Silversite/BinLazy/XamlImageConverter.dll");
- if (!System.IO.File.Exists(assemblyfile)) assemblyfile = HostingEnvironment.MapPath("~/Bin/Lazy/XamlImageConverter.dll");
  var aname = new System.Reflection.AssemblyName("XamlImageConverter");
  aname.CodeBase = new Uri(assemblyfile).ToString();
  var a = System.Reflection.Assembly.Load(aname);
@@ -36,7 +37,7 @@ public class Compiler {
  libraryPath.SetValue(compiler, HostingEnvironment.MapPath("~/bin"));
  var sources = new List<string>() { xic };
  sourceFiles.SetValue(compiler, sources);
- var compile = ct.GetMethod("Compile");
+ var compile = ct.GetMethod("Compile", new Type[0]);
  compile.Invoke(compiler, new object[0]);
  }
  }

diff --git a/XamlImageConverter.Web/Map.cs b/XamlImageConverter.Web/Map.cs
@@ -4,8 +4,6 @@
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using Silversite;
-using Silversite.Web.UI;
 using XamlImageConverter.Web.UI;
 
 namespace XamlImageConverter.Web.UI {
@@ -41,22 +39,35 @@ public enum Modes { Click, Select };
  base.CreateChildControls();
  var xaml = new XamlImage();
 
+ var cssclass = CssClass;
+ if (string.IsNullOrEmpty(cssclass)) cssclass = "";
+ else cssclass = " " + cssclass;
+
+ var source = Source;
+ if (!Source.StartsWith("~") && !Source.StartsWith("http")) {
+ var path = Page.AppRelativeVirtualPath;
+ var slash = path.LastIndexOf('/');
+ if (slash >= 0) path = path.Substring(0, slash+1);
+ Source = path + Source;
+ }
+
  if (Mode == Modes.Select) {
  var boxlist = new CheckBoxList();
  int n = 0;
  if (string.IsNullOrEmpty(IDs)) IDs = Regions;
 
- var ids = IDs.Tokens();
- foreach (var region in Regions.Tokens()) {
+ var ids = IDs.Split(new char[] { ',',';' }, StringSplitOptions.RemoveEmptyEntries)
+ .Select(id => id.Trim())
+ .ToList();
+ foreach (var region in Regions.Split(new char[] { ',',';' }, StringSplitOptions.RemoveEmptyEntries).Select(reg => reg.Trim())) {
  var listItem = new ListItem();
  listItem.Attributes["id"] = "checkbox_" + IDs;
  boxlist.Items.Add(new ListItem(region, n.ToString()));
  }
-
- var script = new Script();
- script.Text = "var selected function(id) { var box = $('#checkbox_' + id); box.prop(\"checked\", !box.attr(\"checked\")); };";
- var src = "<xic:XamlImageProvider xmlns=\"http:https://schemas.johnshope.com/XamlImageConverter/2012\"><xic:Scene Source=\"" + Source + "\"><xic:Snapshot Type=\"png\" >" +
- "<xic:Map File=\"" + Source + ".ascx\" Scale=\"" + Scale + "\"><xic:Areas Elements=\"" + IDs + "\" onclick=\"selected(%ID%);\" href=\"#\" /></xic:Map>";
+
+ Page.ClientScript.RegisterClientScriptBlock(typeof(Map), ClientID, "var xic_selected = function(id) { var box = $('#checkbox_' + id); box.prop(\"checked\", !box.attr(\"checked\")); };");
+ var src = "<XamlImageConverter xmlns=\"http:https://schemas.johnshope.com/XamlImageConverter/2012\"><Scene Source=\"" + Source + "\"><Snapshot Type=\"png\" />" +
+ "<Map File=\"" + Source + ".ascx\" Scale=\"" + Scale + "\" class=\"xic_map" + cssclass + "\"><Areas Elements=\"" + IDs + "\" onclick=\"xic_selected(%ID%);\" href=\"#\" /></Map></Scene></XamlImageConverter>";
  Compiler.Compile(src);
 
  var div = new Panel();
@@ -85,8 +96,8 @@ public enum Modes { Click, Select };
  var box = new Panel();
 
  if (string.IsNullOrEmpty(ID)) ID = "map." + (no++).ToString();
- var src = "<xic:XamlImageProvider xmlns=\"http:https://schemas.johnshope.com/XamlImageConverter/2012\"><xic:Scene Source=\"" + Source + "\"><xic:Snapshot Type=\"png\" >" +
- "<xic:Map File=\"" + Source + ".ascx\" Scale=\"" + Scale + "\" ><xic:Areas Elements=\"" + IDs + "\" onclick=\"_doPostBack('" + box.ClientID + "','%ID%');\" /></xic:Map>";
+ var src = "<XamlImageConverter xmlns=\"http:https://schemas.johnshope.com/XamlImageConverter/2012\"><Scene Source=\"" + Source + "\"><Snapshot Type=\"png\" />" +
+ "<Map File=\"" + Source + ".ascx\" Scale=\"" + Scale + "\" class=\"xic_map" + cssclass + "\"><Areas Elements=\"" + IDs + "\" onclick=\"_doPostBack('" + box.ClientID + "','%ID%');\" /></Map></Scene></XamlImageConverter>";
  Compiler.Compile(src);
 
  var img = new Image();

diff --git a/XamlImageConverter.Web/Properties/AssemblyInfo.cs b/XamlImageConverter.Web/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("3.7.0.0")]
-[assembly: AssemblyFileVersion("3.7.0.0")]
+[assembly: AssemblyVersion("3.8.0.0")]
+[assembly: AssemblyFileVersion("3.8.0.0")]
diff --git a/XamlImageConverter.Web/XamlImageConverter.Web.csproj b/XamlImageConverter.Web/XamlImageConverter.Web.csproj
@@ -48,6 +48,10 @@
  <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
+ <Compile Include="Compiler.cs" />
+ <Compile Include="Map.cs">
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
  <Compile Include="Properties\AssemblyInfo.cs" />
  <Compile Include="XamlControls.cs" />
  <Compile Include="XamlImageConverterLazyHandler.cs" />