1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update recording dialogs

This commit is contained in:
Luke Pulverenti 2016-10-15 18:12:16 -04:00
parent bdfd870584
commit 141344eead
60 changed files with 546 additions and 211 deletions

View file

@ -298,13 +298,14 @@
}
});
view.querySelector('.btnCancelSignup').addEventListener('click', function () {
Emby.Page.back();
});
function goBack() {
require(['embyRouter'], function (embyRouter) {
embyRouter.back();
});
}
view.querySelector('.btnCancelManualServer').addEventListener('click', function () {
Emby.Page.back();
});
view.querySelector('.btnCancelSignup').addEventListener('click', goBack);
view.querySelector('.btnCancelManualServer').addEventListener('click', goBack);
view.querySelector('.btnWelcomeNext').addEventListener('click', function () {
Dashboard.navigate('connectlogin.html?mode=connect');

View file

@ -450,7 +450,7 @@
html += '<div style="display:flex;align-items:center;justify-content:center;text-transform:uppercase;">';
var userImage = DashboardPage.getUserImage(session);
if (userImage) {
html += '<img style="border-radius:50px;margin-right:.5em;" src="' + userImage + '" />';
html += '<img style="height:24px;border-radius:50px;margin-right:.5em;" src="' + userImage + '" />';
} else {
html += '<div style="height:24px;"></div>';
}

View file

@ -1,4 +1,4 @@
define(['imageLoader', 'layoutManager', 'viewManager', 'libraryBrowser', 'apphost', 'paper-icon-button-light', 'material-icons'], function (imageLoader, layoutManager, viewManager, libraryBrowser, appHost) {
define(['imageLoader', 'layoutManager', 'viewManager', 'libraryBrowser', 'apphost', 'embyRouter', 'paper-icon-button-light', 'material-icons'], function (imageLoader, layoutManager, viewManager, libraryBrowser, appHost, embyRouter) {
var enableBottomTabs = AppInfo.isNativeApp;
var enableLibraryNavDrawer = !enableBottomTabs;
@ -60,7 +60,7 @@
function onBackClick() {
Emby.Page.back();
embyRouter.back();
}
function updateUserInHeader(user) {
@ -908,7 +908,7 @@
var backButton = document.querySelector('.headerBackButton');
if (backButton) {
if (page.getAttribute('data-backbutton') == 'true' && Emby.Page.canGoBack()) {
if (page.getAttribute('data-backbutton') == 'true' && embyRouter.canGoBack()) {
backButton.classList.remove('hide');
} else {
backButton.classList.add('hide');

View file

@ -157,7 +157,6 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
if (!AppInfo.isNativeApp) {
options.enableMkvProgressive = item.RunTimeTicks != null;
options.enableTsProgressive = item.RunTimeTicks != null;
options.enableHls = !browserInfo.firefox || item.RunTimeTicks == null;
options.disableVideoAudioCodecs = disableVideoAudioCodecs;
}

View file

@ -1417,9 +1417,7 @@ var AppInfo = {};
});
// alias
define("historyManager", [], function () {
return Emby.Page;
});
define("historyManager", ['embyRouter'], returnFirstDependency);
define("headroom-window", ['headroom'], createWindowHeadroom);
define("hammer-main", ['hammer'], createMainContentHammer);
@ -2682,7 +2680,6 @@ var AppInfo = {};
window.Emby = {};
window.Emby.Page = pageObjects;
window.Emby.TransparencyLevel = pageObjects.TransparencyLevel;
defineCoreRoutes();
Emby.Page.start({
click: true,