Update jQuery, Add Enhancement #9

This commit is contained in:
Thomas Hounsell 2015-05-18 22:02:23 +01:00
parent e291dd5ede
commit 56a8613315
13 changed files with 116 additions and 64 deletions

View File

@ -211,6 +211,9 @@
<Content Include="Areas\admin\Views\meta\create.cshtml" />
<Content Include="Scripts\Chart.js" />
<Content Include="Scripts\Chart.min.js" />
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
<Content Include="Scripts\jquery-2.1.4.js" />
<Content Include="Scripts\jquery-2.1.4.min.js" />
<Content Include="Scripts\jquery.validate.unobtrusive.js" />
<Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
<Content Include="Scripts\trumbowyg\langs\ca.min.js" />
@ -263,12 +266,9 @@
<Content Include="googleacffc6da14c53e15.html" />
<Content Include="content\tile\large.png" />
<Content Include="Scripts\bfs.js" />
<None Include="Scripts\jquery-2.1.3.intellisense.js" />
<Content Include="Scripts\excanvas.compiled.js" />
<Content Include="Scripts\excanvas.js" />
<Content Include="Scripts\jquery-2.1.3.js" />
<Content Include="Scripts\jquery-2.1.3.min.js" />
<Content Include="Scripts\jquery-2.1.3.min.map" />
<Content Include="Scripts\jquery-2.1.4.min.map" />
<None Include="Scripts\jquery.validate-vsdoc.js" />
<Content Include="Scripts\jquery.validate.js" />
<Content Include="Scripts\jquery.validate.min.js" />

View File

@ -183,5 +183,41 @@ public async Task<ActionResult> flight(LevelOfFlight id)
return new EmptyResult();
}
[Route("rss/lab/{lab}")]
public async Task<ActionResult> lab(string lab)
{
var builds = Build.SelectInBuildOrder()
.Where(b => b.Lab == lab)
.Take(20);
RssDocument rdoc = new RssDocument()
{
Channel = new RssChannel()
{
Title = string.Format("BuildFeed RSS - {0} Lab", lab),
Description = "",
Generator = "BuildFeed.net RSS Controller",
Link = new RssUrl(string.Format("{0}://{1}", Request.Url.Scheme, Request.Url.Authority)),
SkipHours = new List<Hour>(),
SkipDays = new List<Day>(),
Items = (from build in builds
select new RssItem()
{
Title = build.FullBuildString,
Link = new RssUrl(string.Format("{0}://{1}{2}", Request.Url.Scheme, Request.Url.Authority, Url.Action("info", new { controller = "Build", id = build.Id }))),
Guid = new RssGuid() { IsPermaLink = true, Value = string.Format("{0}://{1}{2}", Request.Url.Scheme, Request.Url.Authority, Url.Action("info", new { controller = "Build", id = build.Id })) },
}).ToList()
}
};
Response.ContentType = "application/rss+xml";
await Response.Output.WriteAsync(rdoc.ToXml());
return new EmptyResult();
}
}
}

View File

@ -126,6 +126,7 @@ public ActionResult thanks_register()
[Route("rss")]
public ActionResult rss()
{
ViewBag.Labs = Build.SelectBuildLabs();
return View();
}

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
/*!
* jQuery JavaScript Library v2.1.3
* jQuery JavaScript Library v2.1.4
* http://jquery.com/
*
* Includes Sizzle.js
@ -9,7 +9,7 @@
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2014-12-18T15:11Z
* Date: 2015-04-28T16:01Z
*/
(function( global, factory ) {
@ -67,7 +67,7 @@ var
// Use the correct document accordingly with window argument (sandbox)
document = window.document,
version = "2.1.3",
version = "2.1.4",
// Define a local copy of jQuery
jQuery = function( selector, context ) {
@ -531,7 +531,12 @@ jQuery.each("Boolean Number String Function Array Date RegExp Object Error".spli
});
function isArraylike( obj ) {
var length = obj.length,
// Support: iOS 8.2 (not reproducible in simulator)
// `in` check used to prevent JIT error (gh-2145)
// hasOwn isn't used here due to false negatives
// regarding Nodelist length in IE
var length = "length" in obj && obj.length,
type = jQuery.type( obj );
if ( type === "function" || jQuery.isWindow( obj ) ) {

5
Scripts/jquery-2.1.4.min.js vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -17,4 +17,13 @@
<li><a href="@Url.Action("flight", new { controller = "rss", id = "high" })" title="High flight level"><i class="fa fa-sm fa-rss"></i> High flight level</a></li>
</ul>
</li>
<li>
<a href="#rss-labs" data-toggle="collapse">Labs</a>
<ul id="rss-labs" class="collapse">
@foreach (string lab in ViewBag.Labs)
{
<li><a href="@Url.Action("lab", new { controller = "rss", lab = lab })" title="@lab"><i class="fa fa-sm fa-rss"></i> @lab</a></li>
}
</ul>
</li>
</ul>

View File

@ -1,21 +1,21 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=301880
-->
<configuration>
<appSettings>
<add key="webpages:Version" value="3.0.0.0"/>
<add key="webpages:Enabled" value="false"/>
<add key="PreserveLoginUrl" value="true"/>
<add key="ClientValidationEnabled" value="true"/>
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
<add key="data:ServerHost" value="localhost"/>
<add key="data:ServerPort" value="6379"/>
<add key="data:ServerDB" value="1"/>
<add key="form:QuestionFromEmail" value="smtp@betawiki.net"/>
<add key="form:QuestionToEmail" value="thomas@buildfeed.net"/>
<add key="RouteDebugger:Enabled" value="false"/>
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="PreserveLoginUrl" value="true" />
<add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
<add key="data:ServerHost" value="localhost" />
<add key="data:ServerPort" value="6379" />
<add key="data:ServerDB" value="1" />
<add key="form:QuestionFromEmail" value="smtp@betawiki.net" />
<add key="form:QuestionToEmail" value="thomas@buildfeed.net" />
<add key="RouteDebugger:Enabled" value="false" />
</appSettings>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
@ -26,82 +26,82 @@
</system.Web>
-->
<system.web>
<compilation debug="true" targetFramework="4.5.2"/>
<httpRuntime targetFramework="4.5"/>
<globalization culture="en-gb" uiCulture="en-gb"/>
<trace enabled="false" requestLimit="40" pageOutput="true"/>
<sessionState cookieless="UseCookies"/>
<anonymousIdentification cookieless="UseCookies" enabled="false"/>
<compilation debug="true" targetFramework="4.5.2" />
<httpRuntime targetFramework="4.5" />
<globalization culture="en-gb" uiCulture="en-gb" />
<trace enabled="false" requestLimit="40" pageOutput="true" />
<sessionState cookieless="UseCookies" />
<anonymousIdentification cookieless="UseCookies" enabled="false" />
<authentication mode="Forms">
<forms loginUrl="/login/" cookieless="UseCookies" name="BuildFeedAuth"/>
<forms loginUrl="/login/" cookieless="UseCookies" name="BuildFeedAuth" />
</authentication>
<membership defaultProvider="BuildFeedMemberProvider">
<providers>
<clear/>
<add name="BuildFeedMemberProvider" type="RedisAuth.RedisMembershipProvider,RedisAuth"/>
<clear />
<add name="BuildFeedMemberProvider" type="RedisAuth.RedisMembershipProvider,RedisAuth" />
</providers>
</membership>
<roleManager defaultProvider="BuildFeedRoleProvider" enabled="true">
<providers>
<clear/>
<add name="BuildFeedRoleProvider" type="RedisAuth.RedisRoleProvider,RedisAuth"/>
<clear />
<add name="BuildFeedRoleProvider" type="RedisAuth.RedisRoleProvider,RedisAuth" />
</providers>
</roleManager>
<httpModules/>
<httpModules />
</system.web>
<system.webServer>
<modules/>
<urlCompression doDynamicCompression="true"/>
<validation validateIntegratedModeConfiguration="false"/>
<modules />
<urlCompression doDynamicCompression="true" />
<validation validateIntegratedModeConfiguration="false" />
<handlers>
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
<remove name="OPTIONSVerbHandler"/>
<remove name="TRACEVerbHandler"/>
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
<remove name="OPTIONSVerbHandler" />
<remove name="TRACEVerbHandler" />
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
</handlers>
</system.webServer>
<system.net>
<mailSettings>
<smtp configSource="smtp.config"/>
<smtp configSource="smtp.config" />
</mailSettings>
</system.net>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.1.20.0" newVersion="1.1.20.0"/>
<assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.1.20.0" newVersion="1.1.20.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.1.20.0" newVersion="1.1.20.0"/>
<assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.1.20.0" newVersion="1.1.20.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>

View File

@ -3,7 +3,7 @@
<package id="Antlr" version="3.5.0.2" targetFramework="net45" userInstalled="true" />
<package id="Chart.js" version="1.0.2" targetFramework="net45" userInstalled="true" />
<package id="Humanizer" version="1.35.0" targetFramework="net45" userInstalled="true" />
<package id="jQuery" version="2.1.3" targetFramework="net45" userInstalled="true" />
<package id="jQuery" version="2.1.4" targetFramework="net452" userInstalled="true" />
<package id="jquery.TypeScript.DefinitelyTyped" version="2.2.4" targetFramework="net45" userInstalled="true" />
<package id="jQuery.Validation" version="1.13.1" targetFramework="net45" userInstalled="true" />
<package id="jsrender.TypeScript.DefinitelyTyped" version="0.0.3" targetFramework="net45" userInstalled="true" />