From aeda33f37c3c61a2188eb7a72eed377432faca02 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Fri, 30 Nov 2012 17:27:21 -0800 Subject: [PATCH] Allow stopReconnectingTimeout to be reset if already fired. --- .../Scripts/jquery.signalR.js | 1 + .../Scripts/jquery.signalR.min.js | 2 +- .../Scripts/jquery.signalR.js | 1 + .../Scripts/jquery.signalR.min.js | 2 +- src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.core.js | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.js b/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.js index defc484825..b0feb943a2 100644 --- a/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.js +++ b/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.js @@ -95,6 +95,7 @@ stopReconnectingTimeout = window.setTimeout(function () { connection.log(connection.disconnectTimeout + "ms have passed without successfully reconnecting. Disconnecting."); connection.stop(/* async */ false, /* notifyServer */ false); + stopReconnectingTimeout = null; }, connection.disconnectTimeout); } }); diff --git a/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.min.js b/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.min.js index acbbcbbc47..73c43c5843 100644 --- a/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.min.js +++ b/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.min.js @@ -7,4 +7,4 @@ * https://github.com/SignalR/SignalR/blob/master/LICENSE.md * */ -(function(n,t){"use strict";function s(t,r){var u,f;if(n.isArray(t)){for(u=t.length-1;u>=0;u--)f=t[u],n.type(t)==="object"||n.type(f)==="string"&&i.transports[f]||(r.log("Invalid transport: "+f+", removing it from the transports list."),t.splice(u,1));t.length===0&&(r.log("No transports remain within the specified transport array."),t=null)}else n.type(t)==="object"||i.transports[t]||t==="auto"||(r.log("Invalid transport: "+t.toString()),t=null);return t}if(typeof n!="function")throw new Error("SignalR: jQuery not found. Please ensure jQuery is referenced before the SignalR.js file.");if(!t.JSON)throw new Error("SignalR: No JSON parser found. Please ensure json2.js is referenced before the SignalR.js file if you need to support clients without native JSON parsing support, e.g. IE<8.");var i,o,e=t.document.readyState==="complete",f=n(t),r={onStart:"onStart",onStarting:"onStarting",onReceived:"onReceived",onError:"onError",onConnectionSlow:"onConnectionSlow",onReconnecting:"onReconnecting",onReconnect:"onReconnect",onStateChanged:"onStateChanged",onDisconnect:"onDisconnect"},l=function(n,i){if(i!==!1){var r;typeof t.console!="undefined"&&(r="["+(new Date).toTimeString()+"] SignalR: "+n,t.console.debug?t.console.debug(r):t.console.log&&t.console.log(r))}},a=function(i){var r;return(i=n.trim(i),i.indexOf("http")!==0)?!1:(r=t.document.createElement("a"),r.href=i,r.protocol+r.host!==t.location.protocol+t.location.host)},u=function(t,i,u){return i===t.state?(t.state=u,n(t).triggerHandler(r.onStateChanged,[{oldState:i,newState:u}]),!0):!1},c=function(n){return n.state===i.connectionState.disconnected},h=function(n){var i=null;n.reconnecting(function(){i===null&&(i=t.setTimeout(function(){n.log(n.disconnectTimeout+"ms have passed without successfully reconnecting. Disconnecting."),n.stop(!1,!1)},n.disconnectTimeout))}),n.reconnected(function(){t.clearTimeout(i),i=null})};i=function(n,t,r){return new i.fn.init(n,t,r)},i.events=r,i.changeState=u,i.isDisconnecting=c,i.connectionState={connecting:0,connected:1,reconnecting:2,disconnected:4},i.hub={start:function(){throw new Error("SignalR: Error loading hubs. Ensure your hubs reference is correct, e.g.