mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update components
This commit is contained in:
parent
4467991a07
commit
0c9d201edd
4 changed files with 42 additions and 16 deletions
|
@ -14,12 +14,12 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {},
|
"devDependencies": {},
|
||||||
"ignore": [],
|
"ignore": [],
|
||||||
"version": "1.4.147",
|
"version": "1.4.150",
|
||||||
"_release": "1.4.147",
|
"_release": "1.4.150",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "1.4.147",
|
"tag": "1.4.150",
|
||||||
"commit": "466c80a8f45e8e07dac6f09bc887da14d78490f7"
|
"commit": "78b1cb86088034fda6e6caabb33394e5d4ecc0a3"
|
||||||
},
|
},
|
||||||
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
||||||
"_target": "^1.2.1",
|
"_target": "^1.2.1",
|
||||||
|
|
|
@ -311,13 +311,23 @@ button.cardImageContainer {
|
||||||
}
|
}
|
||||||
|
|
||||||
.card .indicators {
|
.card .indicators {
|
||||||
right: 2%;
|
right: 2.5%;
|
||||||
top: 3%;
|
top: 2.5%;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.portraitCard .indicators {
|
||||||
|
right: 3%;
|
||||||
|
top: 2%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.backdropCard .indicators {
|
||||||
|
right: 1.5%;
|
||||||
|
top: 2.8%;
|
||||||
|
}
|
||||||
|
|
||||||
.cardOverlayButton {
|
.cardOverlayButton {
|
||||||
color: #fff !important;
|
color: #fff !important;
|
||||||
background-color: rgba(0,0,0,.7) !important;
|
background-color: rgba(0,0,0,.7) !important;
|
||||||
|
|
|
@ -1,12 +1,17 @@
|
||||||
define(['dom'], function (dom) {
|
define(['dom'], function (dom) {
|
||||||
|
|
||||||
function autoFocus(view, defaultToFirst) {
|
function autoFocus(view, defaultToFirst, findAutoFocusElement) {
|
||||||
|
|
||||||
var element = view.querySelector('*[autofocus]');
|
var element;
|
||||||
if (element) {
|
if (findAutoFocusElement !== false) {
|
||||||
focus(element);
|
element = view.querySelector('*[autofocus]');
|
||||||
return element;
|
if (element) {
|
||||||
} else if (defaultToFirst !== false) {
|
focus(element);
|
||||||
|
return element;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (defaultToFirst !== false) {
|
||||||
element = getFocusableElements(view)[0];
|
element = getFocusableElements(view)[0];
|
||||||
|
|
||||||
if (element) {
|
if (element) {
|
||||||
|
@ -190,7 +195,7 @@ define(['dom'], function (dom) {
|
||||||
var container = activeElement ? getFocusContainer(activeElement, direction) : document.body;
|
var container = activeElement ? getFocusContainer(activeElement, direction) : document.body;
|
||||||
|
|
||||||
if (!activeElement) {
|
if (!activeElement) {
|
||||||
autoFocus(container, true);
|
autoFocus(container, true, false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'browser', 'pageJs', 'appSettings'], function (loading, viewManager, skinManager, pluginManager, backdrop, browser, page, appSettings) {
|
define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'browser', 'pageJs', 'appSettings', 'apphost'], function (loading, viewManager, skinManager, pluginManager, backdrop, browser, page, appSettings, appHost) {
|
||||||
|
|
||||||
var embyRouter = {
|
var embyRouter = {
|
||||||
showLocalLogin: function (apiClient, serverId, manualLogin) {
|
showLocalLogin: function (apiClient, serverId, manualLogin) {
|
||||||
|
@ -300,17 +300,27 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
|
||||||
|
|
||||||
console.log('embyRouter - processing path request ' + pathname);
|
console.log('embyRouter - processing path request ' + pathname);
|
||||||
|
|
||||||
if ((!apiClient || !apiClient.isLoggedIn()) && !route.anonymous) {
|
var isCurrentRouteStartup = currentRouteInfo ? currentRouteInfo.route.startup : true;
|
||||||
|
var shouldExitApp = ctx.isBack && route.isDefaultRoute && isCurrentRouteStartup;
|
||||||
|
|
||||||
|
if (!shouldExitApp && (!apiClient || !apiClient.isLoggedIn()) && !route.anonymous) {
|
||||||
console.log('embyRouter - route does not allow anonymous access, redirecting to login');
|
console.log('embyRouter - route does not allow anonymous access, redirecting to login');
|
||||||
beginConnectionWizard();
|
beginConnectionWizard();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (shouldExitApp) {
|
||||||
|
if (appHost.supports('exit')) {
|
||||||
|
appHost.exit();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (apiClient && apiClient.isLoggedIn()) {
|
if (apiClient && apiClient.isLoggedIn()) {
|
||||||
|
|
||||||
console.log('embyRouter - user is authenticated');
|
console.log('embyRouter - user is authenticated');
|
||||||
|
|
||||||
var isCurrentRouteStartup = currentRouteInfo ? currentRouteInfo.route.startup : true;
|
|
||||||
if (ctx.isBack && (route.isDefaultRoute || route.startup) && !isCurrentRouteStartup) {
|
if (ctx.isBack && (route.isDefaultRoute || route.startup) && !isCurrentRouteStartup) {
|
||||||
handleBackToDefault();
|
handleBackToDefault();
|
||||||
return;
|
return;
|
||||||
|
@ -480,6 +490,7 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
|
||||||
|
|
||||||
// can't use this with home right now due to the back menu
|
// can't use this with home right now due to the back menu
|
||||||
if (currentRouteInfo.route.type != 'home') {
|
if (currentRouteInfo.route.type != 'home') {
|
||||||
|
loading.hide();
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue