jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: SignalR v1.0.1 Migration; Json.NET

Browse Source
This commit is contained in:
Gary Sharp
2013-05-06 19:04:29 +10:00
parent 9431ec983e
commit f320db3538
39 changed files with 2150 additions and 1150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/BI/Interop/SignalRHandlers/RepositoryMonitorNotifications.cs
+4 -3
View File
@@ -1,5 +1,5 @@
using Disco.Data.Repository.Monitor;
using SignalR;
using Microsoft.AspNet.SignalR;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -15,7 +15,7 @@ namespace Disco.BI.Interop.SignalRHandlers
RepositoryMonitor.StreamAfterCommit.Subscribe(AfterCommit);
}
protected override System.Threading.Tasks.Task OnReceivedAsync(IRequest request, string connectionId, string data)
protected override Task OnReceived(IRequest request, string connectionId, string data)
{
// Add to Group
if (!string.IsNullOrWhiteSpace(data) && data.StartsWith("/addToGroups:") && data.Length > 13)
@@ -26,7 +26,8 @@ namespace Disco.BI.Interop.SignalRHandlers
this.Groups.Add(connectionId, g);
}
}
return base.OnReceivedAsync(request, connectionId, data);
return base.OnReceived(request, connectionId, data);
}
private static void AfterCommit(RepositoryMonitorEvent e)
Disco.BI/BI/Interop/SignalRHandlers/UserHeldDevices.cs
+1 -3
View File
@@ -2,9 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using SignalR;
using SignalR.Hosting.AspNet;
using SignalR.Infrastructure;
using Microsoft.AspNet.SignalR;
namespace Disco.BI.Interop.SignalRHandlers
{
Disco.BI/Disco.BI.csproj
+17 -13
View File
@@ -46,28 +46,32 @@
<Reference Include="itextsharp">
<HintPath>..\Resources\Libraries\iTextSharp\itextsharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Core">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Owin">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.0.1\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.SystemWeb">
<HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.1.0.1\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Host.SystemWeb">
<HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.1.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="Quartz">
<HintPath>..\Resources\Libraries\Quartz\Quartz.dll</HintPath>
</Reference>
<Reference Include="SignalR, Version=0.5.1.10822, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.AspNet, Version=0.5.1.10822, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SignalR.Hosting.AspNet.0.5.3\lib\net45\SignalR.Hosting.AspNet.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.Common">
<HintPath>..\packages\SignalR.Hosting.Common.0.5.3\lib\net40\SignalR.Hosting.Common.dll</HintPath>
</Reference>
<Reference Include="Spring.Core">
<HintPath>..\Resources\Libraries\Spring.NET\Spring.Core.dll</HintPath>
</Reference>
@@ -237,7 +241,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" />
<UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
Disco.BI/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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("1.2.0506.1443")]
[assembly: AssemblyFileVersion("1.2.0506.1443")]
[assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1845")]
Disco.BI/packages.config
+6 -4
View File
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Owin" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.SystemWeb" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Newtonsoft.Json" version="5.0.4" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" />
<package id="SignalR.Hosting.AspNet" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Server" version="0.5.3" targetFramework="net45" />
</packages>
Disco.Client/Disco.Client.csproj
+2 -2
View File
@@ -50,7 +50,7 @@
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -122,7 +122,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" />
<UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio>
</ProjectExtensions>
<PropertyGroup>
Disco.Client/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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("1.2.0506.1442")]
[assembly: AssemblyFileVersion("1.2.0506.1442")]
[assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1845")]
Disco.Client/packages.config
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40-Client" />
<package id="Newtonsoft.Json" version="5.0.4" targetFramework="net40-Client" />
</packages>
Disco.ClientBootstrapper/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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("1.2.0506.1436")]
[assembly: AssemblyFileVersion("1.2.0506.1436")]
[assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1845")]
Disco.Data/Disco.Data.csproj
+2 -2
View File
@@ -42,7 +42,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -159,7 +159,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_StartDate="2011/7/1" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
Disco.Data/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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("1.2.0506.1443")]
[assembly: AssemblyFileVersion("1.2.0506.1443")]
[assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1845")]
Disco.Data/packages.config
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Newtonsoft.Json" version="5.0.4" targetFramework="net45" />
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
Disco.Models/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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("1.2.0506.1443")]
[assembly: AssemblyFileVersion("1.2.0506.1443")]
[assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1845")]
Disco.Services/Disco.Services.csproj
+7 -15
View File
@@ -39,31 +39,23 @@
<Reference Include="EntityFramework">
<HintPath>..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Core">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Quartz">
<HintPath>..\Resources\Libraries\Quartz\Quartz.dll</HintPath>
</Reference>
<Reference Include="RazorGenerator.Mvc, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="RazorGenerator.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\RazorGenerator.Mvc.1.5.4.0\lib\net40\RazorGenerator.Mvc.dll</HintPath>
</Reference>
<Reference Include="SignalR, Version=0.5.1.10822, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.AspNet, Version=0.5.1.10822, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SignalR.Hosting.AspNet.0.5.3\lib\net45\SignalR.Hosting.AspNet.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.Common">
<HintPath>..\packages\SignalR.Hosting.Common.0.5.3\lib\net40\SignalR.Hosting.Common.dll</HintPath>
<HintPath>..\packages\RazorGenerator.Mvc.2.0.1\lib\net40\RazorGenerator.Mvc.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -160,7 +152,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" />
<UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio>
</ProjectExtensions>
<PropertyGroup>
Disco.Services/Logging/Targets/LogLiveContext.cs
+4 -5
View File
@@ -2,16 +2,15 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using SignalR;
using SignalR.Hosting.AspNet;
using SignalR.Infrastructure;
using Microsoft.AspNet.SignalR;
using Microsoft.AspNet.SignalR.Infrastructure;
namespace Disco.Services.Logging.Targets
{
public class LogLiveContext : PersistentConnection
{
protected override System.Threading.Tasks.Task OnReceivedAsync(IRequest request, string connectionId, string data)
protected override System.Threading.Tasks.Task OnReceived(IRequest request, string connectionId, string data)
{
// Add to Group
if (!string.IsNullOrWhiteSpace(data) && data.StartsWith("/addToGroups:") && data.Length > 13)
@@ -23,7 +22,7 @@ namespace Disco.Services.Logging.Targets
}
}
return base.OnReceivedAsync(request, connectionId, data);
return base.OnReceived(request, connectionId, data);
}
internal static void Broadcast(LogBase logModule, Models.LogEventType eventType, DateTime Timestamp, params object[] Arguments)
Disco.Services/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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("1.2.0506.1443")]
[assembly: AssemblyFileVersion("1.2.0506.1443")]
[assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1845")]
Disco.Services/Tasks/ScheduledTasksLiveStatusService.cs
+4 -6
View File
@@ -2,16 +2,15 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using SignalR;
using SignalR.Hosting.AspNet;
using SignalR.Infrastructure;
using Microsoft.AspNet.SignalR;
using Microsoft.AspNet.SignalR.Infrastructure;
namespace Disco.Services.Tasks
{
public class ScheduledTasksLiveStatusService : PersistentConnection
{
protected override System.Threading.Tasks.Task OnReceivedAsync(IRequest request, string connectionId, string data)
protected override System.Threading.Tasks.Task OnReceived(IRequest request, string connectionId, string data)
{
// Add to Group
if (!string.IsNullOrWhiteSpace(data) && data.StartsWith("/addToGroups:") && data.Length > 13)
@@ -22,8 +21,7 @@ namespace Disco.Services.Tasks
this.Groups.Add(connectionId, g);
}
}
return base.OnReceivedAsync(request, connectionId, data);
return base.OnReceived(request, connectionId, data);
}
internal static void Broadcast(ScheduledTaskStatusLive SessionStatus)
Disco.Services/packages.config
+3 -5
View File
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="RazorGenerator.Mvc" version="1.5.4.0" targetFramework="net45" />
<package id="SignalR.Hosting.AspNet" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Server" version="0.5.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="5.0.4" targetFramework="net45" />
<package id="RazorGenerator.Mvc" version="2.0.1" targetFramework="net45" />
<package id="SqlServerCompact" version="4.0.8854.1" targetFramework="net40" />
<package id="WebActivatorEx" version="2.0.1" targetFramework="net45" />
</packages>
Disco.Web.Extensions/Disco.Web.Extensions.csproj
+2 -2
View File
@@ -45,7 +45,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -133,7 +133,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_BuildAction="Both" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2011/7/1" />
<UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
Disco.Web.Extensions/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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("1.2.0506.1443")]
[assembly: AssemblyFileVersion("1.2.0506.1443")]
[assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1845")]
Disco.Web.Extensions/packages.config
+1 -1
View File
@@ -5,6 +5,6 @@
<package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Newtonsoft.Json" version="5.0.4" targetFramework="net45" />
<package id="WebActivatorEx" version="2.0.1" targetFramework="net45" />
</packages>
Disco.Web/App_Start/RouteConfig.cs
+2 -2
View File
@@ -4,7 +4,7 @@ using System.Linq;
using System.Web;
using System.Web.Mvc;
using System.Web.Routing;
using SignalR;
using Microsoft.AspNet.SignalR;
namespace Disco.Web
{
@@ -75,7 +75,7 @@ namespace Disco.Web
// Task Status SignalR Route
routes.MapConnection<Disco.Services.Tasks.ScheduledTasksLiveStatusService>(
"API_Logging_TaskStatusNotifications",
"API/Logging/TaskStatusNotifications/{*operation}");
"API/Logging/TaskStatusNotifications");
// Task Status Ajax Route
routes.MapRoute(
Disco.Web/Areas/API/APIAreaRegistration.cs
+4 -4
View File
@@ -1,6 +1,6 @@
using System.Web.Mvc;
using System.Web.Routing;
using SignalR;
using Microsoft.AspNet.SignalR;
namespace Disco.Web.Areas.API
{
@@ -17,13 +17,13 @@ namespace Disco.Web.Areas.API
public override void RegisterArea(AreaRegistrationContext context)
{
context.Routes.MapConnection<Disco.Services.Logging.Targets.LogLiveContext>(
"API_Logging_Notifications", "API/Logging/Notifications/{*operation}");
"API_Logging_Notifications", "API/Logging/Notifications");
context.Routes.MapConnection<Disco.Services.Tasks.ScheduledTasksLiveStatusService>(
"API_Logging_TaskStatusNotifications", "API/Logging/TaskStatusNotifications/{*operation}");
"API_Logging_TaskStatusNotifications", "API/Logging/TaskStatusNotifications");
context.Routes.MapConnection<Disco.BI.Interop.SignalRHandlers.RepositoryMonitorNotifications>(
"API_Repository_Notifications", "API/Repository/Notifications/{*operation}");
"API_Repository_Notifications", "API/Repository/Notifications");
context.MapRoute(
"API_Update",
Disco.Web/Areas/Public/PublicAreaRegistration.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using System.Web.Mvc;
using System.Web.Routing;
using SignalR;
using Microsoft.AspNet.SignalR;
namespace Disco.Web.Areas.Public
{
@@ -17,7 +17,7 @@ namespace Disco.Web.Areas.Public
public override void RegisterArea(AreaRegistrationContext context)
{
context.Routes.MapConnection<BI.Interop.SignalRHandlers.UserHeldDevices>(
"Public_UserHeldDevices_Notifications", "Public/UserHeldDevices/Notifications/{*operation}");
"Public_UserHeldDevices_Notifications", "Public/UserHeldDevices/Notifications");
context.MapRoute(
"Public_Credits",
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR.js
+883 -398
View File
File diff suppressed because it is too large Load Diff
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR.js.bundle
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<bundle minify="true" runOnBuild="true">
<file>/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-0.5.3.js</file>
<file>/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-1.0.1.js</file>
</bundle>
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR.min.js.map
+3 -3
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-0.5.3.js → Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-1.0.1.js
+882 -397
View File
File diff suppressed because it is too large Load Diff
Disco.Web/ClientSource/Style/BundleSite.css
+3
View File
@@ -2163,6 +2163,9 @@ td.subtleHighlight {
.ajaxRemove:hover {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/;
}
#layout_Page div.hiddenDialog {
display: none;
}
/* float clearing for IE6 */
* html .clearfix {
height: 1%;
Disco.Web/ClientSource/Style/BundleSite.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Site.css
+3
View File
@@ -987,6 +987,9 @@ td.subtleHighlight {
.ajaxRemove:hover {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/;
}
#layout_Page div.hiddenDialog {
display: none;
}
/* float clearing for IE6 */
* html .clearfix {
height: 1%;
Disco.Web/ClientSource/Style/Site.less
+4
View File
@@ -1180,6 +1180,10 @@ td.subtleHighlight
}
}
#layout_Page div.hiddenDialog {
display: none;
}
// Clearfix
/* float clearing for IE6 */
* html .clearfix
Disco.Web/ClientSource/Style/Site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/Disco.Web.csproj
+22 -16
View File
@@ -46,27 +46,33 @@
<Reference Include="DotNet.Highcharts">
<HintPath>..\packages\DotNet.Highcharts.1.2\lib\DotNet.Highcharts.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Core">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Owin">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.0.1\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.SystemWeb">
<HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.1.0.1\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Owin.Host.SystemWeb">
<HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.1.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="Quartz, Version=2.0.1.100, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Resources\Libraries\Quartz\Quartz.dll</HintPath>
</Reference>
<Reference Include="RazorGenerator.Mvc, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="RazorGenerator.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\RazorGenerator.Mvc.1.5.4.0\lib\net40\RazorGenerator.Mvc.dll</HintPath>
</Reference>
<Reference Include="SignalR">
<HintPath>..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.AspNet">
<HintPath>..\packages\SignalR.Hosting.AspNet.0.5.3\lib\net45\SignalR.Hosting.AspNet.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.Common">
<HintPath>..\packages\SignalR.Hosting.Common.0.5.3\lib\net40\SignalR.Hosting.Common.dll</HintPath>
<HintPath>..\packages\RazorGenerator.Mvc.2.0.1\lib\net40\RazorGenerator.Mvc.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -157,7 +163,7 @@
</Reference>
<Reference Include="T4MVCExtensions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\T4MVCExtensions.3.5.0\lib\net40\T4MVCExtensions.dll</HintPath>
<HintPath>..\packages\T4MVCExtensions.3.6.1\lib\net40\T4MVCExtensions.dll</HintPath>
</Reference>
<Reference Include="WebActivatorEx">
<HintPath>..\packages\WebActivatorEx.2.0.1\lib\net40\WebActivatorEx.dll</HintPath>
@@ -921,6 +927,7 @@
<None Include="ClientSource\Scripts\Modules\jQueryUI-DynaTree.js">
<DependentUpon>jQueryUI-DynaTree.js.bundle</DependentUpon>
</None>
<Content Include="ClientSource\Scripts\Modules\jQuery-SignalR\jquery.signalR-1.0.1.js" />
<Content Include="ClientSource\Scripts\Modules\jQueryUI-DynaTree.min.js">
<DependentUpon>jQueryUI-DynaTree.js.bundle</DependentUpon>
</Content>
@@ -1372,7 +1379,7 @@
<Content Include="ClientSource\Scripts\Modules\tinymce\utils\form_utils.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\utils\mctabs.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\utils\validate.js" />
<None Include="T4MVC.tt.hooks.t4" />
<Content Include="T4MVC.tt.hooks.t4" />
<Content Include="T4MVC.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>T4MVC.cs</LastGenOutput>
@@ -1768,7 +1775,6 @@
<None Include="_bin_deployableAssemblies\amd64\sqlceca40.dll" />
<None Include="_bin_deployableAssemblies\amd64\Microsoft.VC90.CRT\README_ENU.txt" />
<None Include="_bin_deployableAssemblies\amd64\Microsoft.VC90.CRT\msvcr90.dll" />
<None Include="ClientSource\Scripts\Modules\jQuery-SignalR\jquery.signalR-0.5.3.js" />
<None Include="ClientSource\Scripts\Core\modernizr-2.6.2.js" />
<None Include="T4MVC.tt.settings.xml" />
<Content Include="Web.config">
@@ -1853,7 +1859,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" />
<UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
Disco.Web/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.2.0506.1443")]
[assembly: AssemblyFileVersion("1.2.0506.1443")]
[assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1845")]
Disco.Web/Views/Job/JobParts/Resources.cshtml
+100 -98
View File
@@ -43,17 +43,17 @@
</td>
</tr>
</table>
<div id="dialogUpload" title="Upload Attachment">
<div id="dialogUpload" class="hiddenDialog" title="Upload Attachment">
<div id="silverlightHostUploadAttachment">
</div>
</div>
<div id="dialogRemoveLog" title="Remove this Comment?">
<div id="dialogRemoveLog" class="hiddenDialog" title="Remove this Comment?">
<p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
Are you sure?
</p>
</div>
<div id="dialogRemoveAttachment" title="Remove this Attachment?">
<div id="dialogRemoveAttachment" class="hiddenDialog" title="Remove this Attachment?">
<p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
Are you sure?
@@ -74,6 +74,7 @@
var $CommentOutput = $Comments.find('.commentOutput');
var $CommentOutputContainer = $Comments.find('.commentOutputContainer');
var $CommentInput = $Comments.find('textarea.commentInput');
var $dialogRemoveLog;
window.setTimeout(function () {
$CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
@@ -93,14 +94,6 @@
});
$CommentOutput.find('span.remove').click(removePost);
$dialogRemoveLog = $('#dialogRemoveLog');
$dialogRemoveLog.dialog({
resizable: false,
height: 140,
modal: true,
autoOpen: false
});
function postComment() {
var comment = $CommentInput.val();
if (comment != '') {
@@ -130,8 +123,16 @@
$this = $(this);
var data = { id: $this.closest('div').attr('data-logid') };
$dialogRemoveLog.dialog("enable");
$dialogRemoveLog.dialog('option', 'buttons', {
if (!$dialogRemoveLog) {
$dialogRemoveLog = $('#dialogRemoveLog').dialog({
resizable: false,
height: 140,
modal: true,
autoOpen: false
});
}
$dialogRemoveLog.dialog("enable").dialog('option', 'buttons', {
"Remove": function () {
$dialogRemoveLog.dialog("disable");
$dialogRemoveLog.dialog("option", "buttons", null);
@@ -159,9 +160,7 @@
"Cancel": function () {
$dialogRemoveLog.dialog("close");
}
});
$dialogRemoveLog.dialog('open');
}).dialog('open');
return false;
}
@@ -210,30 +209,12 @@
// - Repository notifications now handles this
document.DiscoFunctions.addAttachment = function () { };
$Attachments = $('#Attachments');
$attachmentOutput = $Attachments.find('.attachmentOutput');
var $Attachments = $('#Attachments');
var $attachmentOutput = $Attachments.find('.attachmentOutput');
var $dialogUpload, $dialogRemoveAttachment;
$attachmentOutput.find('span.remove').click(removeLocalAttachment);
$('#dialogUpload').dialog({
autoOpen: false,
draggable: false,
modal: true,
resizable: false,
width: 860,
height: 550,
close: function () {
silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
}
});
$('#dialogRemoveAttachment').dialog({
resizable: false,
height: 140,
modal: true,
autoOpen: false
});
var onLoadNavigation = null;
var isLoaded = null;
Silverlight.createObject(
@@ -252,7 +233,7 @@
'UploadUrl=@(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)))'
);
$attachmentInput = $Attachments.find('.attachmentInput');
var $attachmentInput = $Attachments.find('.attachmentInput');
$attachmentInput.find('.photo').click(function () {
showDialog('/WebCam');
});
@@ -260,9 +241,22 @@
showDialog('/File');
});
silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
function showDialog(navigationPath) {
$('#dialogUpload').dialog('open');
if (!$dialogUpload) {
$dialogUpload = $('#dialogUpload').dialog({
autoOpen: false,
draggable: false,
modal: true,
resizable: false,
width: 860,
height: 550,
close: function () {
silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
}
});
}
$dialogUpload.dialog('open');
if (isLoaded) {
silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
} else {
@@ -271,40 +265,41 @@
};
function addAttachment(id, quick) {
var data = { id: id };
$.ajax({
url: '@Url.Action(MVC.API.Job.Attachment())',
dataType: 'json',
data: data,
success: function (d) {
if (d.Result == 'OK') {
var a = d.Attachment;
dataType: 'json',
data: data,
success: function (d) {
if (d.Result == 'OK') {
var a = d.Attachment;
if (parseInt(a.ParentId) == jobId) {
var e = $('<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span><span class="remove"></span><span class="timestamp"></span></a>');
if (parseInt(a.ParentId) == jobId) {
var e = $('<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span><span class="remove"></span><span class="timestamp"></span></a>');
e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.Job.AttachmentDownload()))/' + a.Id);
e.find('.icon img').attr('src', '@(Url.Action(MVC.API.Job.AttachmentThumbnail()))/' + a.Id);
e.find('.comments').text(a.Comments);
e.find('.author').text(a.Author);
e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
e.find('.remove').click(removeLocalAttachment);
if (!quick)
e.hide();
$attachmentOutput.append(e);
if (!quick)
e.show('slow');
if (a.MimeType.toLowerCase().indexOf('image/') == 0)
e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.Job.AttachmentDownload()))/' + a.Id);
e.find('.icon img').attr('src', '@(Url.Action(MVC.API.Job.AttachmentThumbnail()))/' + a.Id);
e.find('.comments').text(a.Comments);
e.find('.author').text(a.Author);
e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
e.find('.remove').click(removeLocalAttachment);
if (!quick)
e.hide();
$attachmentOutput.append(e);
if (!quick)
e.show('slow');
if (a.MimeType.toLowerCase().indexOf('image/') == 0)
e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
}
} else {
alert('Unable to add attachment: ' + d.Result);
}
} else {
alert('Unable to add attachment: ' + d.Result);
},
error: function (jqXHR, textStatus, errorThrown) {
alert('Unable to add attachment: ' + textStatus);
}
},
error: function (jqXHR, textStatus, errorThrown) {
alert('Unable to add attachment: ' + textStatus);
}
});
}
});
}
function removeAttachment(id) {
var $element = $attachmentOutput.find('a[data-attachmentid="' + id + '"]');
if ($element.length > 0) {
@@ -321,9 +316,16 @@
var data = { id: $this.attr('data-attachmentid') };
var $dialogRemoveAttachment = $('#dialogRemoveAttachment');
$dialogRemoveAttachment.dialog("enable");
$dialogRemoveAttachment.dialog('option', 'buttons', {
if (!$dialogRemoveAttachment) {
$dialogRemoveAttachment = $('#dialogRemoveAttachment').dialog({
resizable: false,
height: 140,
modal: true,
autoOpen: false
});
}
$dialogRemoveAttachment.dialog("enable").dialog('option', 'buttons', {
"Remove": function () {
$dialogRemoveAttachment.dialog("disable");
$dialogRemoveAttachment.dialog("option", "buttons", null);
@@ -354,9 +356,7 @@
"Cancel": function () {
$dialogRemoveAttachment.dialog("close");
}
});
$dialogRemoveAttachment.dialog('open');
}).dialog('open');
return false;
}
@@ -371,30 +371,32 @@
//#region LiveEvents
function liveMessageRecieved(d) {
if (d) {
switch (d.EntityTypeName) {
case 'JobAttachment':
switch (d.EventType) {
case 0: // Added
addAttachment(d.EntityKey[0], false);
break;
case 1: // Removed
removeAttachment(d.EntityKey[0]);
break;
}
break;
case 'JobLog':
switch (d.EventType) {
case 0: // Added
loadLiveComment(d.EntityKey[0]);
break;
case 1: // Removed
$CommentOutput.children('div[data-logid="' + d.EntityKey[0] + '"]').slideUp(300).delay(300).queue(function () {
$(this).remove();
});
break;
}
break;
}
window.setTimeout(function () {
switch (d.EntityTypeName) {
case 'JobAttachment':
switch (d.EventType) {
case 0: // Added
addAttachment(d.EntityKey[0], false);
break;
case 1: // Removed
removeAttachment(d.EntityKey[0]);
break;
}
break;
case 'JobLog':
switch (d.EventType) {
case 0: // Added
loadLiveComment(d.EntityKey[0]);
break;
case 1: // Removed
$CommentOutput.children('div[data-logid="' + d.EntityKey[0] + '"]').slideUp(300).delay(300).queue(function () {
$(this).remove();
});
break;
}
break;
}
}, 100);
}
}
var liveMessagesConnection = $.connection('@(Url.Content("~/API/Repository/Notifications"))')
Disco.Web/Views/Job/JobParts/Resources.generated.cs
+156 -138
View File
@@ -375,6 +375,8 @@ WriteLiteral("></span>\r\n </div>\r\n </td>\r\n </tr>\r\n</
WriteLiteral(" id=\"dialogUpload\"");
WriteLiteral(" class=\"hiddenDialog\"");
WriteLiteral(" title=\"Upload Attachment\"");
WriteLiteral(">\r\n <div");
@@ -385,6 +387,8 @@ WriteLiteral(">\r\n </div>\r\n</div>\r\n<div");
WriteLiteral(" id=\"dialogRemoveLog\"");
WriteLiteral(" class=\"hiddenDialog\"");
WriteLiteral(" title=\"Remove this Comment?\"");
WriteLiteral(">\r\n <p>\r\n <span");
@@ -397,6 +401,8 @@ WriteLiteral("></span>\r\n Are you sure?\r\n </p>\r\n</div>\r\n<div");
WriteLiteral(" id=\"dialogRemoveAttachment\"");
WriteLiteral(" class=\"hiddenDialog\"");
WriteLiteral(" title=\"Remove this Attachment?\"");
WriteLiteral(">\r\n <p>\r\n <span");
@@ -423,6 +429,7 @@ WriteLiteral(@"');
var $CommentOutput = $Comments.find('.commentOutput');
var $CommentOutputContainer = $Comments.find('.commentOutputContainer');
var $CommentInput = $Comments.find('textarea.commentInput');
var $dialogRemoveLog;
window.setTimeout(function () {
$CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
@@ -442,14 +449,6 @@ WriteLiteral(@"');
});
$CommentOutput.find('span.remove').click(removePost);
$dialogRemoveLog = $('#dialogRemoveLog');
$dialogRemoveLog.dialog({
resizable: false,
height: 140,
modal: true,
autoOpen: false
});
function postComment() {
var comment = $CommentInput.val();
if (comment != '') {
@@ -458,46 +457,36 @@ WriteLiteral(@"');
url: '");
#line 109 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 102 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.CommentPost(Model.Job.Id, null)));
#line default
#line hidden
WriteLiteral(@"',
dataType: 'json',
data: data,
success: function (d) {
if (d.Result == 'OK') {
// Should be added via Repository Notifications
// addComment(d.Comment, false);
$CommentInput.val('').attr('disabled', false).focus();
} else {
alert('Unable to post comment: ' + d.Result);
$CommentInput.attr('disabled', false);
}
},
error: function (jqXHR, textStatus, errorThrown) {
alert('Unable to post comment: ' + textStatus);
$CommentInput.attr('disabled', false);
}
});
}
}
function removePost() {
$this = $(this);
var data = { id: $this.closest('div').attr('data-logid') };
$dialogRemoveLog.dialog(""enable"");
$dialogRemoveLog.dialog('option', 'buttons', {
""Remove"": function () {
$dialogRemoveLog.dialog(""disable"");
$dialogRemoveLog.dialog(""option"", ""buttons"", null);
$.ajax({
url: '");
WriteLiteral("\',\r\n dataType: \'json\',\r\n data: data,\r\n " +
" success: function (d) {\r\n if (d.Result == " +
"\'OK\') {\r\n // Should be added via Repository Notificat" +
"ions\r\n // addComment(d.Comment, false);\r\n " +
" $CommentInput.val(\'\').attr(\'disabled\', false).focus();\r\n " +
" } else {\r\n alert(\'Unable to post comm" +
"ent: \' + d.Result);\r\n $CommentInput.attr(\'disabled\', " +
"false);\r\n }\r\n },\r\n " +
"error: function (jqXHR, textStatus, errorThrown) {\r\n aler" +
"t(\'Unable to post comment: \' + textStatus);\r\n $CommentInp" +
"ut.attr(\'disabled\', false);\r\n }\r\n });\r\n " +
" }\r\n }\r\n function removePost() {\r\n $this = $(this);" +
"\r\n var data = { id: $this.closest(\'div\').attr(\'data-logid\') };\r\n\r\n " +
" if (!$dialogRemoveLog) {\r\n $dialogRemoveLog = $(\'#dialog" +
"RemoveLog\').dialog({\r\n resizable: false,\r\n " +
" height: 140,\r\n modal: true,\r\n autoOpen: f" +
"alse\r\n });\r\n }\r\n\r\n $dialogRemoveLog.dialog(" +
"\"enable\").dialog(\'option\', \'buttons\', {\r\n \"Remove\": function () {" +
"\r\n $dialogRemoveLog.dialog(\"disable\");\r\n $" +
"dialogRemoveLog.dialog(\"option\", \"buttons\", null);\r\n $.ajax({" +
"\r\n url: \'");
#line 139 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 140 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.CommentRemove()));
@@ -526,9 +515,7 @@ WriteLiteral(@"',
""Cancel"": function () {
$dialogRemoveLog.dialog(""close"");
}
});
$dialogRemoveLog.dialog('open');
}).dialog('open');
return false;
}
@@ -537,7 +524,7 @@ WriteLiteral(@"',
url: '");
#line 170 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 169 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.Comment()));
@@ -567,35 +554,47 @@ WriteLiteral(@"',
commentHtml = commentHtml.replace(/\#(\d+)/g, '<a href=""");
#line 191 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 190 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.Job.Show(null)));
#line default
#line hidden
WriteLiteral("?id=$1\">#$1</a>\');\r\n eComment.html(commentHtml);\r\n\r\n $Comme" +
"ntOutput.append(e);\r\n\r\n if (!quick) {\r\n e.animate({ ba" +
"ckgroundColor: \'#ffff99\' }, 500, function () {\r\n e.animate({ " +
"backgroundColor: \'#f4f4f4\' }, 500);\r\n });\r\n $Comme" +
"ntOutput.animate({ scrollTop: $CommentOutput[0].scrollHeight }, 250)\r\n " +
" }\r\n }\r\n //#endregion\r\n\r\n //#region Attachments\r\n i" +
"f (!document.DiscoFunctions) {\r\n document.DiscoFunctions = {};\r\n " +
" }\r\n // For Silverlight Backwards-compatibility\r\n // - Reposito" +
"ry notifications now handles this\r\n document.DiscoFunctions.addAttachment" +
" = function () { };\r\n\r\n $Attachments = $(\'#Attachments\');\r\n $attac" +
"hmentOutput = $Attachments.find(\'.attachmentOutput\');\r\n\r\n $attachmentOutp" +
"ut.find(\'span.remove\').click(removeLocalAttachment);\r\n\r\n $(\'#dialogUpload" +
"\').dialog({\r\n autoOpen: false,\r\n draggable: false,\r\n " +
" modal: true,\r\n resizable: false,\r\n width: 860,\r\n " +
" height: 550,\r\n close: function () {\r\n silverli" +
"ghtUploadAttachment.content.Navigator.Navigate(\'/Hidden\');\r\n }\r\n " +
" });\r\n\r\n $(\'#dialogRemoveAttachment\').dialog({\r\n resizable: " +
"false,\r\n height: 140,\r\n modal: true,\r\n autoOpen" +
": false\r\n });\r\n\r\n var onLoadNavigation = null;\r\n var isLoad" +
"ed = null;\r\n Silverlight.createObject(\r\n \'");
WriteLiteral(@"?id=$1"">#$1</a>');
eComment.html(commentHtml);
$CommentOutput.append(e);
if (!quick) {
e.animate({ backgroundColor: '#ffff99' }, 500, function () {
e.animate({ backgroundColor: '#f4f4f4' }, 500);
});
$CommentOutput.animate({ scrollTop: $CommentOutput[0].scrollHeight }, 250)
}
}
//#endregion
//#region Attachments
if (!document.DiscoFunctions) {
document.DiscoFunctions = {};
}
// For Silverlight Backwards-compatibility
// - Repository notifications now handles this
document.DiscoFunctions.addAttachment = function () { };
var $Attachments = $('#Attachments');
var $attachmentOutput = $Attachments.find('.attachmentOutput');
var $dialogUpload, $dialogRemoveAttachment;
$attachmentOutput.find('span.remove').click(removeLocalAttachment);
var onLoadNavigation = null;
var isLoaded = null;
Silverlight.createObject(
'");
#line 240 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 221 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap);
@@ -616,7 +615,7 @@ WriteLiteral(@"',
'UploadUrl=");
#line 252 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 233 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)));
@@ -625,7 +624,7 @@ WriteLiteral(@"',
WriteLiteral(@"'
);
$attachmentInput = $Attachments.find('.attachmentInput');
var $attachmentInput = $Attachments.find('.attachmentInput');
$attachmentInput.find('.photo').click(function () {
showDialog('/WebCam');
});
@@ -633,9 +632,22 @@ WriteLiteral(@"'
showDialog('/File');
});
silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
function showDialog(navigationPath) {
$('#dialogUpload').dialog('open');
if (!$dialogUpload) {
$dialogUpload = $('#dialogUpload').dialog({
autoOpen: false,
draggable: false,
modal: true,
resizable: false,
width: 860,
height: 550,
close: function () {
silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
}
});
}
$dialogUpload.dialog('open');
if (isLoaded) {
silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
} else {
@@ -644,75 +656,79 @@ WriteLiteral(@"'
};
function addAttachment(id, quick) {
var data = { id: id };
$.ajax({
url: '");
#line 275 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 270 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.Attachment()));
#line default
#line hidden
WriteLiteral(@"',
dataType: 'json',
data: data,
success: function (d) {
if (d.Result == 'OK') {
var a = d.Attachment;
dataType: 'json',
data: data,
success: function (d) {
if (d.Result == 'OK') {
var a = d.Attachment;
if (parseInt(a.ParentId) == jobId) {
var e = $('<a><span class=""icon""><img alt=""Attachment Thumbnail"" /></span><span class=""comments""></span><span class=""author""></span><span class=""remove""></span><span class=""timestamp""></span></a>');
if (parseInt(a.ParentId) == jobId) {
var e = $('<a><span class=""icon""><img alt=""Attachment Thumbnail"" /></span><span class=""comments""></span><span class=""author""></span><span class=""remove""></span><span class=""timestamp""></span></a>');
e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
#line 285 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentDownload()));
#line 280 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentDownload()));
#line default
#line hidden
WriteLiteral("/\' + a.Id);\r\n e.find(\'.icon img\').attr(\'src\', \'");
WriteLiteral("/\' + a.Id);\r\n e.find(\'.icon img\').attr(\'src\', \'");
#line 286 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentThumbnail()));
#line 281 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentThumbnail()));
#line default
#line hidden
WriteLiteral("/\' + a.Id);\r\n e.find(\'.comments\').text(a.Comments);\r\n " +
" e.find(\'.author\').text(a.Author);\r\n " +
" e.find(\'.timestamp\').text(a.TimestampFuzzy).attr(\'title\', a.TimestampF" +
"ull);\r\n e.find(\'.remove\').click(removeLocalAttachment" +
");\r\n if (!quick)\r\n e.h" +
"ide();\r\n $attachmentOutput.append(e);\r\n " +
" if (!quick)\r\n e.show(\'slow\');\r\n " +
" if (a.MimeType.toLowerCase().indexOf(\'image/\') == 0)\r\n " +
" e.shadowbox({ gallery: \'attachments\', player: \'img" +
"\', title: a.Comments });\r\n }\r\n } else " +
"{\r\n alert(\'Unable to add attachment: \' + d.Result);\r\n " +
" }\r\n },\r\n error: function (jqXHR, t" +
"extStatus, errorThrown) {\r\n alert(\'Unable to add attachment: " +
"\' + textStatus);\r\n }\r\n });\r\n }\r\n functio" +
"n removeAttachment(id) {\r\n var $element = $attachmentOutput.find(\'a[d" +
"ata-attachmentid=\"\' + id + \'\"]\');\r\n if ($element.length > 0) {\r\n " +
" $element.hide(300).delay(300).queue(function () {\r\n " +
" if ($element.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n " +
" Shadowbox.removeCache(this);\r\n $element.r" +
"emove();\r\n });\r\n }\r\n }\r\n\r\n function remo" +
"veLocalAttachment() {\r\n $this = $(this).closest(\'a\');\r\n\r\n " +
"var data = { id: $this.attr(\'data-attachmentid\') };\r\n\r\n var $dialogRe" +
"moveAttachment = $(\'#dialogRemoveAttachment\');\r\n $dialogRemoveAttachm" +
"ent.dialog(\"enable\");\r\n $dialogRemoveAttachment.dialog(\'option\', \'but" +
"tons\', {\r\n \"Remove\": function () {\r\n $dialogRe" +
"moveAttachment.dialog(\"disable\");\r\n $dialogRemoveAttachment.d" +
"ialog(\"option\", \"buttons\", null);\r\n $.ajax({\r\n " +
" url: \'");
WriteLiteral("/\' + a.Id);\r\n e.find(\'.comments\').text(a.Comments)" +
";\r\n e.find(\'.author\').text(a.Author);\r\n " +
" e.find(\'.timestamp\').text(a.TimestampFuzzy).attr(\'title\', " +
"a.TimestampFull);\r\n e.find(\'.remove\').click(remov" +
"eLocalAttachment);\r\n if (!quick)\r\n " +
" e.hide();\r\n $attachmentOutpu" +
"t.append(e);\r\n if (!quick)\r\n " +
" e.show(\'slow\');\r\n if (a.MimeType.t" +
"oLowerCase().indexOf(\'image/\') == 0)\r\n e.shad" +
"owbox({ gallery: \'attachments\', player: \'img\', title: a.Comments });\r\n " +
" }\r\n } else {\r\n " +
" alert(\'Unable to add attachment: \' + d.Result);\r\n }\r\n " +
" },\r\n error: function (jqXHR, textStatus, e" +
"rrorThrown) {\r\n alert(\'Unable to add attachment: \' + text" +
"Status);\r\n }\r\n });\r\n }\r\n fun" +
"ction removeAttachment(id) {\r\n var $element = $attachmentOutput.find(" +
"\'a[data-attachmentid=\"\' + id + \'\"]\');\r\n if ($element.length > 0) {\r\n " +
" $element.hide(300).delay(300).queue(function () {\r\n " +
" if ($element.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n" +
" Shadowbox.removeCache(this);\r\n $eleme" +
"nt.remove();\r\n });\r\n }\r\n }\r\n\r\n function " +
"removeLocalAttachment() {\r\n $this = $(this).closest(\'a\');\r\n\r\n " +
" var data = { id: $this.attr(\'data-attachmentid\') };\r\n\r\n if (!$dia" +
"logRemoveAttachment) {\r\n $dialogRemoveAttachment = $(\'#dialogRemo" +
"veAttachment\').dialog({\r\n resizable: false,\r\n " +
" height: 140,\r\n modal: true,\r\n autoOpen" +
": false\r\n });\r\n }\r\n\r\n $dialogRemoveAttachme" +
"nt.dialog(\"enable\").dialog(\'option\', \'buttons\', {\r\n \"Remove\": fun" +
"ction () {\r\n $dialogRemoveAttachment.dialog(\"disable\");\r\n " +
" $dialogRemoveAttachment.dialog(\"option\", \"buttons\", null);\r\n " +
" $.ajax({\r\n url: \'");
#line 331 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 333 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentRemove()));
@@ -734,32 +750,34 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
"to remove attachment: \' + textStatus);\r\n $dialogRemov" +
"eAttachment.dialog(\"close\");\r\n }\r\n });" +
"\r\n },\r\n \"Cancel\": function () {\r\n " +
" $dialogRemoveAttachment.dialog(\"close\");\r\n }\r\n });\r" +
"\n\r\n $dialogRemoveAttachment.dialog(\'open\');\r\n\r\n return fal" +
"se;\r\n }\r\n\r\n $attachmentOutput.children(\'a\').each(function () {\r\n " +
" $this = $(this);\r\n if ($this.attr(\'data-mimetype\').toLowerC" +
"ase().indexOf(\'image/\') == 0)\r\n $this.shadowbox({ gallery: \'attac" +
"hments\', player: \'img\', title: $this.find(\'.comments\').text() });\r\n });\r\n" +
" //#endregion\r\n\r\n //#region LiveEvents\r\n function liveMessa" +
"geRecieved(d) {\r\n if (d) {\r\n switch (d.EntityTypeName)" +
" {\r\n case \'JobAttachment\':\r\n switch (d" +
".EventType) {\r\n case 0: // Added\r\n " +
" addAttachment(d.EntityKey[0], false);\r\n " +
" break;\r\n case 1: // Removed\r\n " +
" removeAttachment(d.EntityKey[0]);\r\n b" +
"reak;\r\n }\r\n break;\r\n " +
" case \'JobLog\':\r\n switch (d.EventType) {\r\n " +
" case 0: // Added\r\n loadLiveComm" +
"ent(d.EntityKey[0]);\r\n break;\r\n " +
" case 1: // Removed\r\n $CommentOutput.chi" +
"ldren(\'div[data-logid=\"\' + d.EntityKey[0] + \'\"]\').slideUp(300).delay(300).queue(" +
"function () {\r\n $(this).remove();\r\n " +
" });\r\n break;\r\n " +
" }\r\n break;\r\n }\r\n }\r\n" +
" }\r\n var liveMessagesConnection = $.connection(\'");
" $dialogRemoveAttachment.dialog(\"close\");\r\n }\r\n }).d" +
"ialog(\'open\');\r\n\r\n return false;\r\n }\r\n\r\n $attachmentOut" +
"put.children(\'a\').each(function () {\r\n $this = $(this);\r\n " +
"if ($this.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n " +
" $this.shadowbox({ gallery: \'attachments\', player: \'img\', title: $this.fin" +
"d(\'.comments\').text() });\r\n });\r\n //#endregion\r\n\r\n //#regio" +
"n LiveEvents\r\n function liveMessageRecieved(d) {\r\n if (d) {\r\n " +
" window.setTimeout(function () {\r\n switch (d.En" +
"tityTypeName) {\r\n case \'JobAttachment\':\r\n " +
" switch (d.EventType) {\r\n case 0: // A" +
"dded\r\n addAttachment(d.EntityKey[0], false);\r" +
"\n break;\r\n cas" +
"e 1: // Removed\r\n removeAttachment(d.EntityKe" +
"y[0]);\r\n break;\r\n " +
"}\r\n break;\r\n case \'JobLog\':\r\n " +
" switch (d.EventType) {\r\n " +
" case 0: // Added\r\n loadLiveComment(d.Entit" +
"yKey[0]);\r\n break;\r\n " +
" case 1: // Removed\r\n $CommentOutput.ch" +
"ildren(\'div[data-logid=\"\' + d.EntityKey[0] + \'\"]\').slideUp(300).delay(300).queue" +
"(function () {\r\n $(this).remove();\r\n " +
" });\r\n break;\r\n" +
" }\r\n break;\r\n " +
" }\r\n }, 100);\r\n }\r\n }\r\n var liveMe" +
"ssagesConnection = $.connection(\'");
#line 400 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 402 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Content("~/API/Repository/Notifications"));
Disco.Web/packages.config
+11 -9
View File
@@ -10,6 +10,11 @@
<package id="knockoutjs" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.JS" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Owin" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.SystemWeb" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi" version="4.0.20710.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
@@ -18,24 +23,21 @@
<package id="Microsoft.jQuery.Unobtrusive.Ajax" version="2.0.30116.0" targetFramework="net45" />
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="2.0.30116.0" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Modernizr" version="2.6.2" targetFramework="net45" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="RazorGenerator.Mvc" version="1.5.4.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="5.0.4" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="RazorGenerator.Mvc" version="2.0.1" targetFramework="net45" />
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" />
<package id="SignalR" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Hosting.AspNet" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Js" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Server" version="0.5.3" targetFramework="net45" />
<package id="SqlServerCompact" version="4.0.8854.1" targetFramework="net45" />
<package id="T4MVC" version="3.5.0" targetFramework="net45" />
<package id="T4MVCExtensions" version="3.5.0" targetFramework="net45" />
<package id="T4MVC" version="3.6.1" targetFramework="net45" />
<package id="T4MVCExtensions" version="3.6.1" targetFramework="net45" />
<package id="TinyMCE" version="3.5.8" targetFramework="net45" />
<package id="TinyMCE.JQuery" version="3.5.8" targetFramework="net45" />
<package id="WebActivatorEx" version="2.0.1" targetFramework="net45" />