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

fix fullscreen button with IE

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-17 21:27:48 -04:00
parent c5802fc5ab
commit 3114742ab7
18 changed files with 125 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -206,17 +206,19 @@ var Dashboard = {
store.removeItem("token");
store.removeItem("serverAddress");
var loginPage = !Dashboard.isConnectMode() ?
'login.html' :
'connectlogin.html';
function onLogoutDone() {
var loginPage = !Dashboard.isConnectMode() ?
'login.html' :
'connectlogin.html';
window.location.href = loginPage;
}
if (logoutWithServer === false) {
window.location.href = loginPage;
onLogoutDone();
} else {
ConnectionManager.logout().done(function () {
window.location.href = loginPage;
});
ConnectionManager.logout().done(onLogoutDone);
}
},
@ -354,14 +356,17 @@ var Dashboard = {
reloadPage: function () {
var currentUrl = getWindowUrl().toLowerCase();
var newUrl;
// If they're on a plugin config page just go back to the dashboard
// The plugin may not have been loaded yet, or could have been uninstalled
if (currentUrl.indexOf('configurationpage') != -1) {
window.location.href = "dashboard.html";
newUrl = "dashboard.html";
} else {
window.location.href = getWindowUrl();
newUrl = getWindowUrl();
}
window.location.href = newUrl;
},
hideDashboardVersionWarning: function () {
@ -1375,7 +1380,7 @@ var Dashboard = {
// The native app can handle a little bit more than safari
if (Dashboard.isRunningInCordova()) {
quality -= 10;
quality -= 15;
if (isBackdrop) {
quality -= 20;
@ -1481,6 +1486,16 @@ var Dashboard = {
deferred.resolve();
});
return deferred.promise();
},
onLoggedIn: function(serverAddress, userId, accessToken, apiClient) {
if (Dashboard.isConnectMode()) {
Dashboard.serverAddress(serverAddress);
}
Dashboard.setCurrentUser(userId, accessToken);
window.ApiClient = apiClient;
}
};