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

maintenance: dependency updates

Browse Source
This commit is contained in:
Gary Sharp
2022-12-04 13:32:10 +11:00
parent 99be87ed9c
commit fcf70f724e
22 changed files with 227 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/ClientSource/Scripts/Core.js
+2 -1
View File
@@ -30523,7 +30523,8 @@ if ( $.watermark.runOnce ) {
}
/* If there is default sorting required - let's do it. The sort function will do the
* drawing for us. Otherwise we draw the table regardless of the Ajax source - this allows
* drawing for us. Otherwise we draw the table regardless of the
* source - this allows
* the table to look initialised for Ajax sourcing data (show 'loading' message possibly)
*/
if ( oSettings.oFeatures.bSort )
Disco.Web/ClientSource/Scripts/Core/jquery.dataTables.js
Vendored
+2 -1
View File
@@ -2594,7 +2594,8 @@
}
/* If there is default sorting required - let's do it. The sort function will do the
* drawing for us. Otherwise we draw the table regardless of the Ajax source - this allows
* drawing for us. Otherwise we draw the table regardless of the
* source - this allows
* the table to look initialised for Ajax sourcing data (show 'loading' message possibly)
*/
if ( oSettings.oFeatures.bSort )
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR.js
+16 -25
View File
@@ -1,14 +1,15 @@
/* jquery.signalR.core.js */
/*global window:false */
/*!
* ASP.NET SignalR JavaScript Library v2.1.1
* ASP.NET SignalR JavaScript Library v2.1.2
* http://signalr.net/
*
* Copyright (C) Microsoft Corporation. All rights reserved.
*
*/
/// <reference path="../Core/jquery-2.1.1.js" />
/// <reference path="Scripts/jquery-1.6.4.js" />
/// <reference path="jquery.signalR.version.js" />
(function ($, window, undefined) {
var resources = {
@@ -704,7 +705,9 @@
connection.id = res.ConnectionId;
connection.token = res.ConnectionToken;
connection.webSocketServerUrl = res.WebSocketServerUrl;
connection._.longPollDelay = res.LongPollDelay * 1000; // in ms
// The long poll timeout is the ConnectionTimeout plus 10 seconds
connection._.pollTimeout = res.ConnectionTimeout * 1000 + 10000; // in ms
// Once the server has labeled the PersistentConnection as Disconnected, we should stop attempting to reconnect
// after res.DisconnectTimeout seconds.
@@ -959,7 +962,6 @@
delete connection._.pingIntervalId;
delete connection._.lastMessageAt;
delete connection._.lastActiveAt;
delete connection._.longPollDelay;
// Clear out our message buffer
connection._.connectingMessageBuffer.clear();
@@ -1317,7 +1319,7 @@
type: "POST"
});
connection.log("Fired ajax abort async = " + async + ".");
connection.log("Fired ajax abort async = " + doAsync + ".");
},
ajaxStart: function (connection, onSuccess) {
@@ -2149,27 +2151,13 @@
events = $.signalR.events,
changeState = $.signalR.changeState,
isDisconnecting = $.signalR.isDisconnecting,
transportLogic = signalR.transports._logic,
browserSupportsXHRProgress = (function () {
try {
return "onprogress" in new window.XMLHttpRequest();
} catch (e) {
// No XHR means no XHR progress event
return false;
}
})();
transportLogic = signalR.transports._logic;
signalR.transports.longPolling = {
name: "longPolling",
supportsKeepAlive: function (connection) {
return browserSupportsXHRProgress &&
connection.ajaxDataType !== "jsonp" &&
// Don't check for keep alives if there is a delay configured between poll requests.
// Don't check for keep alives if the server didn't send back the "LongPollDelay" as
// part of the response to /negotiate. That indicates the server is running an older
// version of SignalR that doesn't send long polling keep alives.
connection._.longPollDelay === 0;
supportsKeepAlive: function () {
return false;
},
reconnectDelay: 3000,
@@ -2244,6 +2232,7 @@
}
},
url: url,
timeout: connection._.pollTimeout,
success: function (result) {
var minData,
delay = 0,
@@ -2486,6 +2475,8 @@
};
},
constructor: hubProxy,
hasSubscriptions: function () {
return hasMembers(this._.callbackMap);
},
@@ -2823,7 +2814,7 @@
/*global window:false */
/// <reference path="jquery.signalR.core.js" />
(function ($, undefined) {
$.signalR.version = "2.1.1";
$.signalR.version = "2.1.2";
}(window.jQuery));
/*!
@@ -2836,8 +2827,8 @@
*
*/
/// <reference path="..\..\SignalR.Client.JS\Scripts\jquery-1.6.4.js" />
/// <reference path="jquery.signalR.js" />
/// <reference path="..\..\Core\jquery-2.1.1.js" />
/// <reference path="jquery.signalR-2.1.1.js" />
(function ($, window, undefined) {
/// <param name="$" type="jQuery" />
"use strict";
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR/disco-hubs.es5.js
+122
View File
@@ -0,0 +1,122 @@
/*!
* ASP.NET SignalR JavaScript Library v2.1.1
* http://signalr.net/
*
* Copyright Microsoft Open Technologies, Inc. All rights reserved.
* Licensed under the Apache 2.0
* https://github.com/SignalR/SignalR/blob/master/LICENSE.md
*
*/
/// <reference path="..\..\Core\jquery-2.1.1.js" />
"use strict";
(function ($, window, undefined) {
/// <param name="$" type="jQuery" />
"use strict";
if (typeof $.signalR !== "function") {
throw new Error("SignalR: SignalR is not loaded. Please ensure jquery.signalR-x.js is referenced before ~/signalr/js.");
}
var signalR = $.signalR;
function makeProxyCallback(hub, callback) {
return function () {
// Call the client hub method
callback.apply(hub, $.makeArray(arguments));
};
}
function registerHubProxies(instance, shouldSubscribe) {
var key, hub, memberKey, memberValue, subscriptionMethod;
for (key in instance) {
if (instance.hasOwnProperty(key)) {
hub = instance[key];
if (!hub.hubName) {
// Not a client hub
continue;
}
if (shouldSubscribe) {
// We want to subscribe to the hub events
subscriptionMethod = hub.on;
} else {
// We want to unsubscribe from the hub events
subscriptionMethod = hub.off;
}
// Loop through all members on the hub and find client hub functions to subscribe/unsubscribe
for (memberKey in hub.client) {
if (hub.client.hasOwnProperty(memberKey)) {
memberValue = hub.client[memberKey];
if (!$.isFunction(memberValue)) {
// Not a client hub function
continue;
}
subscriptionMethod.call(hub, memberKey, makeProxyCallback(hub, memberValue));
}
}
}
}
}
$.hubConnection.prototype.createHubProxies = function () {
var proxies = {};
this.starting(function () {
// Register the hub proxies as subscribed
// (instance, shouldSubscribe)
registerHubProxies(proxies, true);
this._registerSubscribedHubs();
}).disconnected(function () {
// Unsubscribe all hub proxies when we "disconnect". This is to ensure that we do not re-add functional call backs.
// (instance, shouldSubscribe)
registerHubProxies(proxies, false);
});
proxies['deviceBatchUpdates'] = this.createHubProxy('deviceBatchUpdates');
proxies['deviceBatchUpdates'].client = {};
proxies['deviceBatchUpdates'].server = {};
proxies['deviceUpdates'] = this.createHubProxy('deviceUpdates');
proxies['deviceUpdates'].client = {};
proxies['deviceUpdates'].server = {};
proxies['jobUpdates'] = this.createHubProxy('jobUpdates');
proxies['jobUpdates'].client = {};
proxies['jobUpdates'].server = {};
proxies['logNotifications'] = this.createHubProxy('logNotifications');
proxies['logNotifications'].client = {};
proxies['logNotifications'].server = {};
proxies['noticeboardUpdates'] = this.createHubProxy('noticeboardUpdates');
proxies['noticeboardUpdates'].client = {};
proxies['noticeboardUpdates'].server = {};
proxies['scheduledTaskNotifications'] = this.createHubProxy('scheduledTaskNotifications');
proxies['scheduledTaskNotifications'].client = {};
proxies['scheduledTaskNotifications'].server = {
getStatus: function getStatus() {
/// <summary>Calls the GetStatus method on the server-side scheduledTaskNotifications hub.&#10;Returns a jQuery.Deferred() promise.</summary>
return proxies['scheduledTaskNotifications'].invoke.apply(proxies['scheduledTaskNotifications'], $.merge(["GetStatus"], $.makeArray(arguments)));
}
};
proxies['userUpdates'] = this.createHubProxy('userUpdates');
proxies['userUpdates'].client = {};
proxies['userUpdates'].server = {};
return proxies;
};
signalR.hub = $.hubConnection("/API/Signalling", { useDefaultPath: false });
$.extend(signalR, signalR.hub.createHubProxies());
})(window.jQuery, window);
/// <reference path="jquery.signalR-2.1.1.js" />
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR/disco-hubs.es5.min.js
Vendored
+10
View File
@@ -0,0 +1,10 @@
/*!
* ASP.NET SignalR JavaScript Library v2.1.1
* http://signalr.net/
*
* Copyright Microsoft Open Technologies, Inc. All rights reserved.
* Licensed under the Apache 2.0
* https://github.com/SignalR/SignalR/blob/master/LICENSE.md
*
*/
(function(n){"use strict";function r(t,i){return function(){i.apply(t,n.makeArray(arguments))}}function i(t,i){var e,u,f,o,s;for(e in t)if(t.hasOwnProperty(e)){if(u=t[e],!u.hubName)continue;s=i?u.on:u.off;for(f in u.client)if(u.client.hasOwnProperty(f)){if(o=u.client[f],!n.isFunction(o))continue;s.call(u,f,r(u,o))}}}if(typeof n.signalR!="function")throw new Error("SignalR: SignalR is not loaded. Please ensure jquery.signalR-x.js is referenced before ~/signalr/js.");var t=n.signalR;n.hubConnection.prototype.createHubProxies=function(){var t={};return this.starting(function(){i(t,!0);this._registerSubscribedHubs()}).disconnected(function(){i(t,!1)}),t.deviceBatchUpdates=this.createHubProxy("deviceBatchUpdates"),t.deviceBatchUpdates.client={},t.deviceBatchUpdates.server={},t.deviceUpdates=this.createHubProxy("deviceUpdates"),t.deviceUpdates.client={},t.deviceUpdates.server={},t.jobUpdates=this.createHubProxy("jobUpdates"),t.jobUpdates.client={},t.jobUpdates.server={},t.logNotifications=this.createHubProxy("logNotifications"),t.logNotifications.client={},t.logNotifications.server={},t.noticeboardUpdates=this.createHubProxy("noticeboardUpdates"),t.noticeboardUpdates.client={},t.noticeboardUpdates.server={},t.scheduledTaskNotifications=this.createHubProxy("scheduledTaskNotifications"),t.scheduledTaskNotifications.client={},t.scheduledTaskNotifications.server={getStatus:function(){return t.scheduledTaskNotifications.invoke.apply(t.scheduledTaskNotifications,n.merge(["GetStatus"],n.makeArray(arguments)))}},t.userUpdates=this.createHubProxy("userUpdates"),t.userUpdates.client={},t.userUpdates.server={},t};t.hub=n.hubConnection("/API/Signalling",{useDefaultPath:!1});n.extend(t,t.hub.createHubProxies())})(window.jQuery,window);
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-2.1.1.js → Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-2.1.2.js
+14 -23
View File
@@ -1,14 +1,15 @@
/* jquery.signalR.core.js */
/*global window:false */
/*!
* ASP.NET SignalR JavaScript Library v2.1.1
* ASP.NET SignalR JavaScript Library v2.1.2
* http://signalr.net/
*
* Copyright (C) Microsoft Corporation. All rights reserved.
*
*/
/// <reference path="../../Core/jquery-2.1.1.js" />
/// <reference path="Scripts/jquery-1.6.4.js" />
/// <reference path="jquery.signalR.version.js" />
(function ($, window, undefined) {
var resources = {
@@ -704,7 +705,9 @@
connection.id = res.ConnectionId;
connection.token = res.ConnectionToken;
connection.webSocketServerUrl = res.WebSocketServerUrl;
connection._.longPollDelay = res.LongPollDelay * 1000; // in ms
// The long poll timeout is the ConnectionTimeout plus 10 seconds
connection._.pollTimeout = res.ConnectionTimeout * 1000 + 10000; // in ms
// Once the server has labeled the PersistentConnection as Disconnected, we should stop attempting to reconnect
// after res.DisconnectTimeout seconds.
@@ -959,7 +962,6 @@
delete connection._.pingIntervalId;
delete connection._.lastMessageAt;
delete connection._.lastActiveAt;
delete connection._.longPollDelay;
// Clear out our message buffer
connection._.connectingMessageBuffer.clear();
@@ -1317,7 +1319,7 @@
type: "POST"
});
connection.log("Fired ajax abort async = " + async + ".");
connection.log("Fired ajax abort async = " + doAsync + ".");
},
ajaxStart: function (connection, onSuccess) {
@@ -2149,27 +2151,13 @@
events = $.signalR.events,
changeState = $.signalR.changeState,
isDisconnecting = $.signalR.isDisconnecting,
transportLogic = signalR.transports._logic,
browserSupportsXHRProgress = (function () {
try {
return "onprogress" in new window.XMLHttpRequest();
} catch (e) {
// No XHR means no XHR progress event
return false;
}
})();
transportLogic = signalR.transports._logic;
signalR.transports.longPolling = {
name: "longPolling",
supportsKeepAlive: function (connection) {
return browserSupportsXHRProgress &&
connection.ajaxDataType !== "jsonp" &&
// Don't check for keep alives if there is a delay configured between poll requests.
// Don't check for keep alives if the server didn't send back the "LongPollDelay" as
// part of the response to /negotiate. That indicates the server is running an older
// version of SignalR that doesn't send long polling keep alives.
connection._.longPollDelay === 0;
supportsKeepAlive: function () {
return false;
},
reconnectDelay: 3000,
@@ -2244,6 +2232,7 @@
}
},
url: url,
timeout: connection._.pollTimeout,
success: function (result) {
var minData,
delay = 0,
@@ -2486,6 +2475,8 @@
};
},
constructor: hubProxy,
hasSubscriptions: function () {
return hasMembers(this._.callbackMap);
},
@@ -2823,5 +2814,5 @@
/*global window:false */
/// <reference path="jquery.signalR.core.js" />
(function ($, undefined) {
$.signalR.version = "2.1.1";
$.signalR.version = "2.1.2";
}(window.jQuery));
Disco.Web/Disco.Web.csproj
+9 -9
View File
@@ -50,13 +50,11 @@
<Reference Include="MarkdownSharp">
<HintPath>..\packages\MarkdownSharp.1.13.0.0\lib\35\MarkdownSharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.1.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.1.2\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.SystemWeb, Version=2.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.2.1.1\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
<Reference Include="Microsoft.AspNet.SignalR.SystemWeb, Version=2.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.2.1.2\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -71,8 +69,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Owin.Security.2.1.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -1875,7 +1873,6 @@
<Generator>RazorGenerator</Generator>
<LastGenOutput>Welcome.generated.cs</LastGenOutput>
</None>
<None Include="ClientSource\Scripts\Modules\jQuery-SignalR\jquery.signalR-2.1.1.js" />
<None Include="ClientSource\Style\tinymce\img\anchor.gif" />
<None Include="ClientSource\Style\tinymce\img\loader.gif" />
<None Include="ClientSource\Style\tinymce\img\object.gif" />
@@ -2278,6 +2275,7 @@
<None Include="ClientSource\Scripts\Modules\Knockout\knockout-3.1.0.js" />
<None Include="ClientSource\Scripts\Core\modernizr-2.7.2.js" />
<None Include="ClientSource\Scripts\Core\jquery-ui-1.10.4.js" />
<None Include="ClientSource\Scripts\Modules\jQuery-SignalR\jquery.signalR-2.1.2.js" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
@@ -2381,7 +2379,9 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\BuildBundlerMinifier.3.2.449\build\BuildBundlerMinifier.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BuildBundlerMinifier.3.2.449\build\BuildBundlerMinifier.targets'))" />
<Error Condition="!Exists('..\packages\BuildWebCompiler2022.1.14.8\build\BuildWebCompiler2022.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BuildWebCompiler2022.1.14.8\build\BuildWebCompiler2022.targets'))" />
</Target>
<Import Project="..\packages\BuildWebCompiler2022.1.14.8\build\BuildWebCompiler2022.targets" Condition="Exists('..\packages\BuildWebCompiler2022.1.14.8\build\BuildWebCompiler2022.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Disco.Web/bundleconfig.json
+1 -1
View File
@@ -95,7 +95,7 @@
{
"outputFileName": "ClientSource/Scripts/Modules/jQuery-SignalR.js",
"inputFiles": [
"ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-2.1.1.js",
"ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-2.1.2.js",
"ClientSource/Scripts/Modules/jQuery-SignalR/disco-hubs.js"
]
},
Disco.Web/compilerconfig.json
-8
View File
@@ -82,13 +82,5 @@
{
"outputFile": "ClientSource/Style/User.css",
"inputFile": "ClientSource/Style/User.less"
},
{
"outputFile": "ClientSource/Scripts/Modules/jQuery-SignalR/disco-hubs.es5.js",
"inputFile": "ClientSource/Scripts/Modules/jQuery-SignalR/disco-hubs.js"
},
{
"outputFile": "ClientSource/Scripts/Modules/jQuery-SignalR.es5.js",
"inputFile": "ClientSource/Scripts/Modules/jQuery-SignalR.js"
}
]
Disco.Web/packages.config
+6 -5
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BuildBundlerMinifier" version="3.2.449" targetFramework="net45" />
<package id="BuildWebCompiler2022" version="1.14.8" targetFramework="net45" />
<package id="DotNet.Highcharts" version="4.0" targetFramework="net45" />
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
<package id="EntityFramework.SqlServerCompact" version="4.3.6" targetFramework="net45" />
@@ -13,10 +14,10 @@
<package id="MarkdownSharp" version="1.13.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR" version="2.1.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="2.1.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.JS" version="2.1.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.SystemWeb" version="2.1.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR" version="2.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="2.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.JS" version="2.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.SystemWeb" version="2.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
@@ -33,7 +34,7 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Modernizr" version="2.7.2" targetFramework="net45" />
<package id="Moment.js" version="2.7.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="RazorGenerator.Mvc" version="2.2.3" targetFramework="net45" />
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />