mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fix recent activity episode titles
This commit is contained in:
parent
ba15a638ba
commit
ce58a73714
8 changed files with 60 additions and 35 deletions
|
@ -16,12 +16,12 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {},
|
"devDependencies": {},
|
||||||
"ignore": [],
|
"ignore": [],
|
||||||
"version": "1.1.113",
|
"version": "1.1.114",
|
||||||
"_release": "1.1.113",
|
"_release": "1.1.114",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "1.1.113",
|
"tag": "1.1.114",
|
||||||
"commit": "69a87cba28f55f11fcef19cef9e71329623c4635"
|
"commit": "48c97330f32bf96d488c71e922fd7258916b82cb"
|
||||||
},
|
},
|
||||||
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
|
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
|
||||||
"_target": "^1.1.51",
|
"_target": "^1.1.51",
|
||||||
|
|
|
@ -357,6 +357,8 @@
|
||||||
|
|
||||||
function onConnectUserSignIn(user) {
|
function onConnectUserSignIn(user) {
|
||||||
|
|
||||||
|
appStorage.removeItem('lastLocalServerId');
|
||||||
|
|
||||||
connectUser = user;
|
connectUser = user;
|
||||||
events.trigger(self, 'connectusersignedin', [user]);
|
events.trigger(self, 'connectusersignedin', [user]);
|
||||||
}
|
}
|
||||||
|
@ -462,6 +464,12 @@
|
||||||
|
|
||||||
function onLocalUserSignIn(server, connectionMode, user) {
|
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
|
// Ensure this is created so that listeners of the event can get the apiClient instance
|
||||||
getOrAddApiClient(server, connectionMode);
|
getOrAddApiClient(server, connectionMode);
|
||||||
|
|
||||||
|
@ -475,29 +483,26 @@
|
||||||
|
|
||||||
function ensureConnectUser(credentials) {
|
function ensureConnectUser(credentials) {
|
||||||
|
|
||||||
return new Promise(function (resolve, reject) {
|
if (connectUser && connectUser.Id === credentials.ConnectUserId) {
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
|
||||||
if (connectUser && connectUser.Id === credentials.ConnectUserId) {
|
else if (credentials.ConnectUserId && credentials.ConnectAccessToken) {
|
||||||
resolve();
|
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
}, function () {
|
||||||
resolve();
|
return Promise.resolve();
|
||||||
|
});
|
||||||
|
|
||||||
}, function () {
|
} else {
|
||||||
resolve();
|
return Promise.resolve();
|
||||||
});
|
}
|
||||||
|
|
||||||
} else {
|
|
||||||
resolve();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function getConnectUrl(handler) {
|
function getConnectUrl(handler) {
|
||||||
|
@ -732,6 +737,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (credentials.ConnectAccessToken) {
|
||||||
|
appStorage.removeItem('lastLocalServerId');
|
||||||
|
}
|
||||||
|
|
||||||
credentials.Servers = servers;
|
credentials.Servers = servers;
|
||||||
credentials.ConnectAccessToken = null;
|
credentials.ConnectAccessToken = null;
|
||||||
credentials.ConnectUserId = null;
|
credentials.ConnectUserId = null;
|
||||||
|
@ -930,9 +939,18 @@
|
||||||
|
|
||||||
console.log('Begin connectToServers, with ' + servers.length + ' servers');
|
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) {
|
if (result.State === ConnectionState.Unavailable) {
|
||||||
|
|
||||||
|
|
|
@ -14,12 +14,12 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {},
|
"devDependencies": {},
|
||||||
"ignore": [],
|
"ignore": [],
|
||||||
"version": "1.4.467",
|
"version": "1.4.468",
|
||||||
"_release": "1.4.467",
|
"_release": "1.4.468",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "1.4.467",
|
"tag": "1.4.468",
|
||||||
"commit": "bd1118e1637ab6edef1c61eb66593171eea35962"
|
"commit": "3f10ed5f1938f5c1c9eb84f1f36e3b8606f03b88"
|
||||||
},
|
},
|
||||||
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
||||||
"_target": "^1.2.1",
|
"_target": "^1.2.1",
|
||||||
|
|
|
@ -151,20 +151,20 @@
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
}
|
}
|
||||||
|
|
||||||
var settingsKey = 'periodicmessage-' + feature;
|
var settingsKey = 'periodicmessage2-' + feature;
|
||||||
|
|
||||||
var lastMessage = parseInt(appSettings.get(settingsKey) || '0');
|
var lastMessage = parseInt(appSettings.get(settingsKey) || '0');
|
||||||
|
|
||||||
if (!lastMessage) {
|
if (!lastMessage) {
|
||||||
|
|
||||||
// Don't show on the very first playback attempt
|
// Don't show on the very first playback attempt
|
||||||
appSettings.set(settingsKey, new Date().getTime());
|
appSettings.set(settingsKey, new Date().getTime() - intervalMs);
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((new Date().getTime() - lastMessage) > intervalMs) {
|
if ((new Date().getTime() - lastMessage) > intervalMs) {
|
||||||
|
|
||||||
connectionManager.currentApiClient().getPluginSecurityInfo().then(function (regInfo) {
|
return connectionManager.currentApiClient().getPluginSecurityInfo().then(function (regInfo) {
|
||||||
|
|
||||||
if (regInfo.IsMBSupporter) {
|
if (regInfo.IsMBSupporter) {
|
||||||
appSettings.set(settingsKey, new Date().getTime());
|
appSettings.set(settingsKey, new Date().getTime());
|
||||||
|
|
|
@ -806,7 +806,9 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'scrollStyles'], func
|
||||||
capture: true
|
capture: true
|
||||||
});
|
});
|
||||||
|
|
||||||
dragSourceElement.removeEventListener('mousedown', dragInitSlidee);
|
dom.removeEventListener(dragSourceElement, 'mousedown', dragInitSlidee, {
|
||||||
|
//passive: true
|
||||||
|
});
|
||||||
|
|
||||||
// Reset initialized status and return the instance
|
// Reset initialized status and return the instance
|
||||||
self.initialized = 0;
|
self.initialized = 0;
|
||||||
|
@ -880,7 +882,12 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'scrollStyles'], func
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dragSourceElement.addEventListener('mousedown', dragInitSlidee);
|
if (o.horizontal || transform) {
|
||||||
|
// This can prevent others from being able to listen to mouse events
|
||||||
|
dom.addEventListener(dragSourceElement, 'mousedown', dragInitSlidee, {
|
||||||
|
//passive: true
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (transform) {
|
if (transform) {
|
||||||
|
|
||||||
|
|
|
@ -379,5 +379,5 @@
|
||||||
"Retry": "Volver a intentar",
|
"Retry": "Volver a intentar",
|
||||||
"HeaderMyDevice": "Mi Dispositivo",
|
"HeaderMyDevice": "Mi Dispositivo",
|
||||||
"MediaQueued": "Medios en cola.",
|
"MediaQueued": "Medios en cola.",
|
||||||
"ContinuingInSecondsValue": "Continuing in {0} seconds."
|
"ContinuingInSecondsValue": "Continuando en {0} segundos."
|
||||||
}
|
}
|
|
@ -54,7 +54,7 @@
|
||||||
function getPeriodicMessageIntervalMs(feature) {
|
function getPeriodicMessageIntervalMs(feature) {
|
||||||
|
|
||||||
if (feature === 'playback') {
|
if (feature === 'playback') {
|
||||||
return 172800000;
|
return 43200000;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
showDetailsMenu: true,
|
showDetailsMenu: true,
|
||||||
centerText: !supportsImageAnalysis,
|
centerText: !supportsImageAnalysis,
|
||||||
overlayPlayButton: AppInfo.enableAppLayouts && !supportsImageAnalysis,
|
overlayPlayButton: true,
|
||||||
context: 'home-nextup',
|
context: 'home-nextup',
|
||||||
cardLayout: supportsImageAnalysis,
|
cardLayout: supportsImageAnalysis,
|
||||||
vibrant: supportsImageAnalysis
|
vibrant: supportsImageAnalysis
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue