mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

improve web socket close

Browse source
This commit is contained in:
Luke Pulverenti 2013-09-09 14:23:55 -04:00
parent 4056a61775
commit abef9d9254
3 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ApiClient.js
View file

@ -27,14 +27,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
var currentUserId;
var webSocket;
$(window).on("beforeunload", function () {
// Close the connection gracefully when possible
if (webSocket && webSocket.readyState === WebSocket.OPEN) {
webSocket.close();
}
});
/**
* Gets the server host name.
*/
@ -195,6 +187,12 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
};
};
self.closeWebSocket = function () {
if (webSocket && webSocket.readyState === WebSocket.OPEN) {
webSocket.close();
}
};
self.sendWebSocketMessage = function (name, data) {
var msg = { MessageType: name };
@ -3427,17 +3425,15 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
throw new Error("null itemId");
}
// Always use the http api in case playback is stopped by closing the browser
// See window beforeunload event at the top of this file
//if (self.isWebSocketOpen()) {
if (self.isWebSocketOpen()) {
// var deferred = $.Deferred();
var deferred = $.Deferred();
// self.sendWebSocketMessage("PlaybackStopped", itemId + "|" + (positionTicks == null ? "" : positionTicks));
self.sendWebSocketMessage("PlaybackStopped", itemId + "|" + (positionTicks == null ? "" : positionTicks));
// deferred.resolveWith(null, []);
// return deferred.promise();
//}
deferred.resolveWith(null, []);
return deferred.promise();
}
var params = {
};

9
dashboard-ui/scripts/site.js
View file

@ -1167,6 +1167,14 @@ $(function () {
if (!IsStorageEnabled()) {
alert("This browser does not support local storage or is running in private mode. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
}
$(window).on("beforeunload", function () {
// Close the connection gracefully when possible
if (ApiClient.isWebSocketOpen() && !MediaPlayer.isPlaying()) {
ApiClient.closeWebSocket();
}
});
});
Dashboard.jQueryMobileInit();
@ -1209,3 +1217,4 @@ $(document).on('pagebeforeshow', ".page", function () {
}
});

2
packages.config
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.172" targetFramework="net45" />
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.174" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.58" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.58" targetFramework="net45" />
</packages>