Skip to content

Commit

Permalink
Manually applied PR from SignalR
Browse files Browse the repository at this point in the history
  • Loading branch information
davidfowl committed Dec 24, 2013
1 parent 31565f8 commit 180de3a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion JabbR/Scripts/jquery.signalR-2.1.0-pre-131129-b292.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
$(connection).triggerHandler(events.onError, [error]);
};

if (!config.pingIntervalId && config.pingInterval) {
if (!connection._.pingIntervalId && config.pingInterval) {
connection._.pingIntervalId = window.setInterval(function () {
signalR.transports._logic.pingServer(connection).fail(onFail);
}, config.pingInterval);
Expand Down
2 changes: 1 addition & 1 deletion JabbR/Views/Home/index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@
.Add("~/Scripts/jquery.dragsort-0.5.1.min.js")
.Add("~/Scripts/jquery.pulse.min.js")
.Add("~/Scripts/jquery.KeyTips.js")
.Add("~/Scripts/jquery.signalR-2.1.0-pre-131129-b292.min.js")
.Add("~/Scripts/jquery.signalR-2.1.0-pre-131129-b292.js")
.Render("~/Scripts/JabbR1_#.js"));
}
<script type="text/javascript" src="@Url.Content("~/signalr/hubs")"></script>
Expand Down
2 changes: 1 addition & 1 deletion JabbR/Views/Home/monitor.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
.Add("~/Scripts/jquery-2.0.3.min.js")
.Add("~/Scripts/jquery-migrate-1.2.1.min.js")
.Add("~/Scripts/json2.min.js")
.Add("~/Scripts/jquery.signalR-2.1.0-pre-131129-b292.min.js")
.Add("~/Scripts/jquery.signalR-2.1.0-pre-131129-b292.js")
.Render("~/Scripts/JabbR3_#.js"));
}
<script type="text/javascript" src="@Url.Content("~/signalr/hubs")"></script>
Expand Down

0 comments on commit 180de3a

Please sign in to comment.