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

support adding additional users to sessions

Browse source
This commit is contained in:
Luke Pulverenti 2014-01-03 21:35:41 -05:00
parent e8e1978bb4
commit 2957a40d8d
5 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ApiClient.js
View file

@ -2,7 +2,7 @@
window.MediaBrowser = {}; window.MediaBrowser = {};
} }
MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, window) { MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, window, FileReader) {
/** /**
* Creates a new api client instance * Creates a new api client instance
@ -3982,7 +3982,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
}; };
}(jQuery, navigator, window.JSON, window.WebSocket, setTimeout, window); }(jQuery, navigator, window.JSON, window.WebSocket, setTimeout, window, window.FileReader);
/** /**
* Provides a friendly way to create an api client instance using information from the browser's current url * Provides a friendly way to create an api client instance using information from the browser's current url
@ -4208,7 +4208,7 @@ MediaBrowser.SHA1 = function (msg) {
} }
if (matched.platform) { if (matched.platform) {
browser[matched.platform] = true browser[matched.platform] = true;
} }
// Chrome is Webkit, but Webkit is also Safari. // Chrome is Webkit, but Webkit is also Safari.

1
dashboard-ui/scripts/edititemmetadata.js
View file

@ -787,6 +787,7 @@
$('#labelDisplayOrder', page).html('Title display order:'); $('#labelDisplayOrder', page).html('Title display order:');
$('#selectDisplayOrder', page).html('<option value="SortName">Sort Name</option><option value="PremiereDate">Release Date</option>').selectmenu('refresh'); $('#selectDisplayOrder', page).html('<option value="SortName">Sort Name</option><option value="PremiereDate">Release Date</option>').selectmenu('refresh');
} else { } else {
$('#selectDisplayOrder', page).html('').selectmenu('refresh');
$('#fldDisplayOrder', page).hide(); $('#fldDisplayOrder', page).hide();
} }

6
dashboard-ui/scripts/extensions.js
View file

@ -1,6 +1,10 @@
function IsStorageEnabled() { function IsStorageEnabled() {
if (!window.localStorage) {
return false;
}
try { try {
localStorage.setItem("__test", "data"); window.localStorage.setItem("__test", "data");
} catch (err) { } catch (err) {
if ((err.name).toUpperCase() == 'QUOTA_EXCEEDED_ERR') { if ((err.name).toUpperCase() == 'QUOTA_EXCEEDED_ERR') {
return false; return false;

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

@ -87,6 +87,10 @@ var Dashboard = {
getCurrentUserId: function () { getCurrentUserId: function () {
if (!window.localStorage) {
return null;
}
var userId = localStorage.getItem("userId"); var userId = localStorage.getItem("userId");
if (!userId) { if (!userId) {
@ -102,13 +106,21 @@ var Dashboard = {
}, },
setCurrentUser: function (userId) { setCurrentUser: function (userId) {
if (window.localStorage) {
localStorage.setItem("userId", userId); localStorage.setItem("userId", userId);
}
ApiClient.currentUserId(userId); ApiClient.currentUserId(userId);
Dashboard.getUserPromise = null; Dashboard.getUserPromise = null;
}, },
logout: function () { logout: function () {
if (window.localStorage) {
localStorage.removeItem("userId"); localStorage.removeItem("userId");
}
Dashboard.getUserPromise = null; Dashboard.getUserPromise = null;
ApiClient.currentUserId(null); ApiClient.currentUserId(null);
window.location = "login.html"; window.location = "login.html";
@ -1284,11 +1296,11 @@ var Dashboard = {
if (!window.WebSocket) { if (!window.WebSocket) {
alert("This browser does not support web sockets. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera."); alert("This browser does not support web sockets. For a better experience, try a newer browser such as Chrome, Firefox, IE10+, Safari (iOS) or Opera.");
} }
if (!IsStorageEnabled()) { else 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."); 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, Firefox, IE10+, Safari (iOS) or Opera.");
} }

2
packages.config
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.217" targetFramework="net45" /> <package id="MediaBrowser.ApiClient.Javascript" version="3.0.218" targetFramework="net45" />
</packages> </packages>