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 recent activity episode titles

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-13 02:26:22 -05:00
parent ba15a638ba
commit ce58a73714
8 changed files with 60 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-apiclient/.bower.json vendored
View file

@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.1.113",
"_release": "1.1.113",
"version": "1.1.114",
"_release": "1.1.114",
"_resolution": {
"type": "version",
"tag": "1.1.113",
"commit": "69a87cba28f55f11fcef19cef9e71329623c4635"
"tag": "1.1.114",
"commit": "48c97330f32bf96d488c71e922fd7258916b82cb"
},
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51",

56
dashboard-ui/bower_components/emby-apiclient/connectionmanager.js vendored
View file

@ -357,6 +357,8 @@
function onConnectUserSignIn(user) {
appStorage.removeItem('lastLocalServerId');
connectUser = user;
events.trigger(self, 'connectusersignedin', [user]);
}
@ -462,6 +464,12 @@
function onLocalUserSignIn(server, connectionMode, user) {
if (self.connectUserId()) {
appStorage.removeItem('lastLocalServerId');
} else {
appStorage.setItem('lastLocalServerId', server.Id);
}
// Ensure this is created so that listeners of the event can get the apiClient instance
getOrAddApiClient(server, connectionMode);
@ -475,29 +483,26 @@
function ensureConnectUser(credentials) {
return new Promise(function (resolve, reject) {
if (connectUser && connectUser.Id === credentials.ConnectUserId) {
return Promise.resolve();
}
if (connectUser && connectUser.Id === credentials.ConnectUserId) {
resolve();
}
else if (credentials.ConnectUserId && credentials.ConnectAccessToken) {
else if (credentials.ConnectUserId && credentials.ConnectAccessToken) {
connectUser = null;
connectUser = null;
return getConnectUser(credentials.ConnectUserId, credentials.ConnectAccessToken).then(function (user) {
getConnectUser(credentials.ConnectUserId, credentials.ConnectAccessToken).then(function (user) {
onConnectUserSignIn(user);
return Promise.resolve();
onConnectUserSignIn(user);
resolve();
}, function () {
return Promise.resolve();
});
}, function () {
resolve();
});
} else {
resolve();
}
});
} else {
return Promise.resolve();
}
}
function getConnectUrl(handler) {
@ -732,6 +737,10 @@
}
}
if (credentials.ConnectAccessToken) {
appStorage.removeItem('lastLocalServerId');
}
credentials.Servers = servers;
credentials.ConnectAccessToken = null;
credentials.ConnectUserId = null;
@ -930,9 +939,18 @@
console.log('Begin connectToServers, with ' + servers.length + ' servers');
if (servers.length === 1) {
var defaultServer = servers.length === 1 ? servers[0] : null;
return self.connectToServer(servers[0], options).then(function (result) {
if (!defaultServer) {
var lastLocalServerId = appStorage.getItem('lastLocalServerId');
defaultServer = servers.filter(function (s) {
return s.Id === lastLocalServerId;
})[0];
}
if (defaultServer) {
return self.connectToServer(defaultServer, options).then(function (result) {
if (result.State === ConnectionState.Unavailable) {