Update chart UI, update Jquery

WebCms.Tests/WebCms.Tests.csproj

@@ -49,6 +49,7 @@
     <Compile Include="Models\ResultStatusViewModelTests.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

WebCms.Tests/app.config

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.9.9.0" newVersion="6.9.9.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

WebCms/App_Data/Models/all.dll.path

@@ -1 +1 @@
-C:\Users\poprhythm\AppData\Local\Temp\Temporary ASP.NET Files\vs\f80e29bb\faae20bf\App_Web_all.generated.cs.8f9494c4.ymeptwl9.dll
+C:\Users\poprhythm\AppData\Local\Temp\Temporary ASP.NET Files\vs\f80e29bb\faae20bf\App_Web_all.generated.cs.8f9494c4.q2jvbaow.dll

WebCms/Views/Master.cshtml

@@ -17,7 +17,7 @@
     Html.RequiresCss("~/Content/site.css");
     Html.RequiresCss("~/Content/style.css");
     Html.RequiresCss("~/css/rte.css");
-    Html.RequiresJs("~/scripts/jquery-1.11.1.js", 0);
+    Html.RequiresJs("~/scripts/jquery-1.12.4.js", 0);
     Html.RequiresJs("~/scripts/bootstrap.js", 0);
     Html.RequiresJs("~/scripts/site.js");
 }

WebCms/Views/Queue/Index.cshtml

@@ -46,8 +46,5 @@
 
 @helper ChartLink(dynamic item)
 {
-if (item.HasLeafChart)
+@Html.Partial("DisplayTemplates/_ChartLink", (int)item.LeafInputId)
-{
-        @Html.Partial("DisplayTemplates/_ChartLink", (int)item.LeafInputId)
-}
 }

WebCms/Views/Results/Index.cshtml

@@ -19,6 +19,6 @@
 {
 if (item.HasLeafChart)
 {
-    @Html.Partial("DisplayTemplates/_ChartLink", (int)item.LeafInputId)
+    @Html.Partial("DisplayTemplates/_ChartButton", (int)item.LeafInputId)
 }
 }

WebCms/Views/Shared/DisplayTemplates/_ChartButton.cshtml

@@ -0,0 +1,6 @@
+@model int
+<a href="@UmbracoContext.Current.UrlProvider.GetUrl(1100)?leafInputId=@Model" class="btn btn-default btn-xs" role="button">
+    <span class="glyphicon glyphicon-stats"></span>
+    Chart
+</a>
+

WebCms/Views/Shared/DisplayTemplates/_ChartLink.cshtml

@@ -1,5 +1,5 @@
 @model int
-<a href="@UmbracoContext.Current.UrlProvider.GetUrl(1100)?leafInputId=@Model" class="btn btn-default btn-xs" role="button">
+<a href="@UmbracoContext.Current.UrlProvider.GetUrl(1100)?leafInputId=@Model">
     <span class="glyphicon glyphicon-stats"></span>
     Chart
 </a>

WebCms/WebCms.csproj

@@ -695,12 +695,13 @@
     <Content Include="Config\applications.config" />
     <Content Include="Config\404handlers.config" />
     <None Include="Properties\PublishProfiles\LeafWebUmbraco - Web Deploy.pubxml" />
-    <None Include="scripts\jquery-1.11.1.intellisense.js" />
     <Content Include="scripts\Chart.js" />
-    <Content Include="scripts\jquery-1.11.1.js" />
+    <None Include="scripts\jquery-1.12.4.intellisense.js" />
-    <Content Include="scripts\jquery-1.11.1.min.js" />
+    <Content Include="scripts\jquery-1.12.4.js" />
+    <Content Include="scripts\jquery-1.12.4.min.js" />
     <Content Include="scripts\jquery.autocomplete.js" />
     <Content Include="scripts\jquery.autocomplete.min.js" />
+    <Content Include="scripts\jquery-1.12.4.min.map" />
     <None Include="scripts\jquery.validate-vsdoc.js" />
     <Content Include="scripts\jquery.validate.js" />
     <Content Include="scripts\jquery.validate.min.js" />
@@ -753,7 +754,6 @@
       <SubType>Designer</SubType>
     </None>
     <None Include="Backload\Web.Backload.config" />
-    <Content Include="scripts\jquery-1.11.1.min.map" />
     <Content Include="Views\Results\DownloadNotFound.cshtml" />
     <Content Include="Views\Results\Index.cshtml" />
     <Content Include="Views\MacroPartials\Results.cshtml" />
@@ -790,6 +790,7 @@
     <Content Include="Views\Shared\DisplayTemplates\_ChartLink.cshtml" />
     <Content Include="Views\Shared\DisplayTemplates\_LeafInputStatus.cshtml" />
     <Content Include="Views\Shared\DisplayTemplates\_DetailsLink.cshtml" />
+    <Content Include="Views\Shared\DisplayTemplates\_ChartButton.cshtml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>

WebCms/packages.config

@@ -15,7 +15,7 @@
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net452" />
   <package id="ImageProcessor" version="2.4.5.0" targetFramework="net452" />
   <package id="ImageProcessor.Web" version="4.6.6.0" targetFramework="net452" />
-  <package id="jQuery" version="1.11.1" targetFramework="net452" />
+  <package id="jQuery" version="1.12.4" targetFramework="net452" />
   <package id="jquery.validate.unobtrusive.bootstrap" version="1.2.3" targetFramework="net452" />
   <package id="jQuery.Validation" version="1.11.1" targetFramework="net452" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net452" />

WebCms/scripts/Chart.js

@@ -16,32 +16,37 @@
 	};
 
 	var baseUrl = "/umbraco/surface/Chart/ChartCurve";
+	var $chart = $("#chart");
+	var $chartError = $('#chart-error');
+
 	$('#CurveId')
 		.change(function () {
-			$('#chart-error').removeClass('text-danger').text('');
+			$chartError.removeClass('text-danger').text('');
-			var $chart = $("#chart");
-			$chart.removeAttr('src');
 
 			//  this is the "Select CurveId" instruction
 			if (this.selectedIndex === 0) {
+				$chart.removeAttr('src');
 				return;
 			}
 
 			var curveId = $("option:selected", this).text();
 
-			var $spinner = $chart.after('<span class="glyphicon glyphicon-refresh gly-spin" style="font-size: 3em"></span>').next('span');
+			$chart.after('<span class="glyphicon glyphicon-refresh gly-spin" style="font-size: 3em"></span>');
 
 			var leafInputId = getUrlParameter("leafInputId");
 			var url = baseUrl + "?leafInputId=" + leafInputId + "&curveId=" + curveId;
-			$chart.load(function () {
+
-				$spinner.remove();
+			$chart.attr('src', url);
-			})
-			.error(function () {
-				//$chart.removeAttr('src');
-				$spinner.remove();
-				$('#chart-error').addClass('text-danger').text('A problem was encountered loading this chart.');
-				return;
-				})
-			.attr('src', url);
 		});
+
+	$chart.load(function () {
+		$chart.next('span.gly-spin').remove(); // remove spinner
+	})
+	.error(function () {
+		$chart.next('span.gly-spin').remove(); // remove spinner
+		if ($chart.attr('src') != undefined) {
+			$chart.removeAttr('src');
+			$chartError.addClass('text-danger').text('A problem was encountered loading this chart.');
+		}
+	});
 });