mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fixes #1958 - Title does not reset on home browse (Web Interface)
This commit is contained in:
parent
96a169fb05
commit
2737d1f9f9
39 changed files with 97 additions and 139 deletions
|
@ -203,7 +203,7 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
|
||||||
return;
|
return;
|
||||||
//}
|
//}
|
||||||
}
|
}
|
||||||
viewManager.tryRestoreView(currentRequest).then(function () {
|
viewManager.tryRestoreView(currentRequest, function () {
|
||||||
|
|
||||||
// done
|
// done
|
||||||
currentRouteInfo = {
|
currentRouteInfo = {
|
||||||
|
@ -211,7 +211,12 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
|
||||||
path: ctx.path
|
path: ctx.path
|
||||||
};
|
};
|
||||||
|
|
||||||
}, onNewViewNeeded);
|
}).catch(function (result) {
|
||||||
|
|
||||||
|
if (!result || !result.cancelled) {
|
||||||
|
onNewViewNeeded();
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
var firstConnectionResult;
|
var firstConnectionResult;
|
||||||
|
|
|
@ -35,8 +35,6 @@ define(['viewcontainer', 'focusManager', 'queryString', 'layoutManager'], functi
|
||||||
|
|
||||||
function onViewChange(view, options, isRestore) {
|
function onViewChange(view, options, isRestore) {
|
||||||
|
|
||||||
var viewType = options.type;
|
|
||||||
|
|
||||||
var lastView = currentView;
|
var lastView = currentView;
|
||||||
if (lastView) {
|
if (lastView) {
|
||||||
dispatchViewEvent(lastView, 'viewhide');
|
dispatchViewEvent(lastView, 'viewhide');
|
||||||
|
@ -123,67 +121,54 @@ define(['viewcontainer', 'focusManager', 'queryString', 'layoutManager'], functi
|
||||||
//events.on(connectionManager, 'localusersignedin', resetCachedViews);
|
//events.on(connectionManager, 'localusersignedin', resetCachedViews);
|
||||||
//events.on(connectionManager, 'localusersignedout', resetCachedViews);
|
//events.on(connectionManager, 'localusersignedout', resetCachedViews);
|
||||||
|
|
||||||
function tryRestoreInternal(viewcontainer, options, resolve, reject) {
|
function ViewManager() {
|
||||||
|
}
|
||||||
|
|
||||||
|
ViewManager.prototype.loadView = function (options) {
|
||||||
|
|
||||||
|
var lastView = currentView;
|
||||||
|
|
||||||
|
// Record the element that has focus
|
||||||
|
if (lastView) {
|
||||||
|
lastView.activeElement = document.activeElement;
|
||||||
|
}
|
||||||
|
|
||||||
if (options.cancel) {
|
if (options.cancel) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
viewcontainer.tryRestoreView(options).then(function (view) {
|
viewcontainer.loadView(options).then(function (view) {
|
||||||
|
|
||||||
|
onViewChange(view, options);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
ViewManager.prototype.tryRestoreView = function (options, onViewChanging) {
|
||||||
|
|
||||||
|
if (options.cancel) {
|
||||||
|
return Promise.reject({ cancelled: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Record the element that has focus
|
||||||
|
if (currentView) {
|
||||||
|
currentView.activeElement = document.activeElement;
|
||||||
|
}
|
||||||
|
|
||||||
|
return viewcontainer.tryRestoreView(options).then(function (view) {
|
||||||
|
|
||||||
|
onViewChanging();
|
||||||
onViewChange(view, options, true);
|
onViewChange(view, options, true);
|
||||||
resolve();
|
|
||||||
|
|
||||||
}, reject);
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
function ViewManager() {
|
ViewManager.prototype.currentView = function () {
|
||||||
|
return currentView;
|
||||||
|
};
|
||||||
|
|
||||||
var self = this;
|
ViewManager.prototype.dispatchPageEvents = function (value) {
|
||||||
|
dispatchPageEvents = value;
|
||||||
self.loadView = function (options) {
|
};
|
||||||
|
|
||||||
var lastView = currentView;
|
|
||||||
|
|
||||||
// Record the element that has focus
|
|
||||||
if (lastView) {
|
|
||||||
lastView.activeElement = document.activeElement;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options.cancel) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
viewcontainer.loadView(options).then(function (view) {
|
|
||||||
|
|
||||||
onViewChange(view, options);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
self.tryRestoreView = function (options) {
|
|
||||||
return new Promise(function (resolve, reject) {
|
|
||||||
|
|
||||||
if (options.cancel) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Record the element that has focus
|
|
||||||
if (currentView) {
|
|
||||||
currentView.activeElement = document.activeElement;
|
|
||||||
}
|
|
||||||
|
|
||||||
tryRestoreInternal(viewcontainer, options, resolve, reject);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
self.currentView = function () {
|
|
||||||
return currentView;
|
|
||||||
};
|
|
||||||
|
|
||||||
self.dispatchPageEvents = function (value) {
|
|
||||||
dispatchPageEvents = value;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return new ViewManager();
|
return new ViewManager();
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-backbutton="true" data-menubutton="false">
|
<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<form class="userProfileSettingsForm" style="margin: 0 auto;">
|
<form class="userProfileSettingsForm" style="margin: 0 auto;">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="channelItemsPage" data-role="page" class="page libraryPage channelsPage noSecondaryNavPage" data-require="scripts/channelitems" data-backbutton="true" data-menubutton="false">
|
<div id="channelItemsPage" data-role="page" class="page libraryPage channelsPage noSecondaryNavPage" data-require="scripts/channelitems" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="viewSettings">
|
<div class="viewSettings">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="channelsPage" data-role="page" data-dom-cache="true" class="page libraryPage channelsPage pageWithAbsoluteTabs" data-contextname="${HeaderChannels}">
|
<div id="channelsPage" data-role="page" data-dom-cache="true" class="page libraryPage channelsPage pageWithAbsoluteTabs" data-title="${HeaderChannels}">
|
||||||
|
|
||||||
<div is="emby-tabs" class="libraryViewNav">
|
<div is="emby-tabs" class="libraryViewNav">
|
||||||
<div class="emby-tabs-slider">
|
<div class="emby-tabs-slider">
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
html += '<h1 style="display:inline-block; vertical-align:middle;" class="listHeader">' + Globalize.translate(section.name) + '</h1>';
|
html += '<h1 style="display:inline-block; vertical-align:middle;" class="listHeader">' + Globalize.translate(section.name) + '</h1>';
|
||||||
|
|
||||||
if (options.Limit && result.Items.length >= options.Limit) {
|
if (options.Limit && result.Items.length >= options.Limit) {
|
||||||
var href = "secondaryitems.html?type=" + section.types + "&filters=IsFavorite&titlekey=" + section.name;
|
var href = "secondaryitems.html?type=" + section.types + "&filters=IsFavorite";
|
||||||
|
|
||||||
html += '<a class="clearLink" href="' + href + '" style="margin-left:2em;"><button is="emby-button" type="button" class="raised more mini">' + Globalize.translate('ButtonMore') + '</button></a>';
|
html += '<a class="clearLink" href="' + href + '" style="margin-left:2em;"><button is="emby-button" type="button" class="raised more mini">' + Globalize.translate('ButtonMore') + '</button></a>';
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,7 +91,7 @@
|
||||||
|
|
||||||
.libraryMenuButtonText {
|
.libraryMenuButtonText {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
font-weight: 500 !important;
|
font-weight: 400 !important;
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
padding-left: 0 !important;
|
padding-left: 0 !important;
|
||||||
|
@ -102,7 +102,7 @@
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
margin-left: .5em;
|
margin-left: .75em;
|
||||||
font-size: 108%;
|
font-size: 108%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,8 @@
|
||||||
@media all and (min-width: 300px) {
|
.libraryMenuButtonText {
|
||||||
|
font-weight: 500 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media all and (min-width: 300px) {
|
||||||
|
|
||||||
.libraryViewNav, .emby-tabs-slider {
|
.libraryViewNav, .emby-tabs-slider {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
@ -72,6 +72,10 @@ h1, h1 a {
|
||||||
font-weight: 400 !important;
|
font-weight: 400 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.libraryMenuButtonText {
|
||||||
|
font-weight: 500 !important;
|
||||||
|
}
|
||||||
|
|
||||||
.btnNotificationsInner {
|
.btnNotificationsInner {
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-contextname="${MetadataManager}" data-require="scripts/editorsidebar,scripts/edititemmetadata">
|
<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-title="${MetadataManager}" data-require="scripts/editorsidebar,scripts/edititemmetadata">
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
#editItemMetadataPage .editMetadataForm {
|
#editItemMetadataPage .editMetadataForm {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="liveTvSuggestedPage" data-dom-cache="true" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs" data-contextname="${HeaderLiveTv}" data-backdroptype="series,movie">
|
<div id="liveTvSuggestedPage" data-dom-cache="true" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs" data-title="${HeaderLiveTv}" data-backdroptype="series,movie">
|
||||||
|
|
||||||
<div is="emby-tabs" class="libraryViewNav">
|
<div is="emby-tabs" class="libraryViewNav">
|
||||||
<div class="emby-tabs-slider">
|
<div class="emby-tabs-slider">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="liveTvItemsPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvitems,livetvcss" data-backbutton="true" data-menubutton="false">
|
<div id="liveTvItemsPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-title="${HeaderLiveTv}" data-require="scripts/livetvitems,livetvcss" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="viewSettings">
|
<div class="viewSettings">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="liveTvRecordingListPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvrecordinglist,livetvcss" data-backbutton="true" data-menubutton="false">
|
<div id="liveTvRecordingListPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-title="${HeaderLiveTv}" data-require="scripts/livetvrecordinglist,livetvcss" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="viewSettings" style="margin:.5em 0;">
|
<div class="viewSettings" style="margin:.5em 0;">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-backbutton="true" data-menubutton="false">
|
<div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-title="${HeaderLiveTv}" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-backbutton="true" data-menubutton="false">
|
<div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-menubutton="false">
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<form class="displayPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
|
<form class="displayPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
|
||||||
<div class="detailSection languageSection hide">
|
<div class="detailSection languageSection hide">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-backbutton="true" data-menubutton="false">
|
<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
|
<form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-backbutton="true" data-menubutton="false">
|
<div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}">
|
<div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderSettings}">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="readOnlyContent" style="margin: 0 auto;">
|
<div class="readOnlyContent" style="margin: 0 auto;">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-backbutton="true" data-menubutton="false">
|
<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<br />
|
<br />
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="mySyncActivityPage" data-role="page" class="page libraryPage syncActivityPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}">
|
<div id="mySyncActivityPage" data-role="page" class="page libraryPage syncActivityPage mySyncPage noSecondaryNavPage" data-title="${TitleSync}">
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.status-text-icon {
|
.status-text-icon {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="mySyncJobPage" data-role="page" class="page libraryPage syncJobPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-backbutton="true" data-menubutton="false">
|
<div id="mySyncJobPage" data-role="page" class="page libraryPage syncJobPage mySyncPage noSecondaryNavPage" data-title="${TitleSync}" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-backbutton="true" data-menubutton="false">
|
<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<form class="userProfileSettingsForm" style="margin: 0 auto;">
|
<form class="userProfileSettingsForm" style="margin: 0 auto;">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-contextname="${TitleRemoteControl}" data-theme="b" style="padding:0;">
|
<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-title="${TitleRemoteControl}" data-theme="b" style="padding:0;">
|
||||||
|
|
||||||
<div class="remoteControlContent">
|
<div class="remoteControlContent">
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="libraryReportManagerPage" data-role="page" class="page libraryPage noSecondaryNavPage reportsPage" data-contextname="${HeaderReports}" data-require="jQuery,paper-icon-button-light,jqmcheckbox,jqmpanel,jqmcollapsible,jqmtable,scripts/reports,detailtablecss">
|
<div id="libraryReportManagerPage" data-role="page" class="page libraryPage noSecondaryNavPage reportsPage" data-title="${HeaderReports}" data-require="jQuery,paper-icon-button-light,jqmcheckbox,jqmpanel,jqmcollapsible,jqmtable,scripts/reports,detailtablecss">
|
||||||
<style>
|
<style>
|
||||||
/* Page and overlay */
|
/* Page and overlay */
|
||||||
.ui-page-theme-b .ui-panel-wrapper {
|
.ui-page-theme-b .ui-panel-wrapper {
|
||||||
|
|
|
@ -303,23 +303,23 @@
|
||||||
|
|
||||||
if (context == 'sync') {
|
if (context == 'sync') {
|
||||||
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Sync');
|
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Sync');
|
||||||
Dashboard.setPageTitle(Globalize.translate('TitleSync'));
|
LibraryMenu.setTitle(Globalize.translate('TitleSync'));
|
||||||
}
|
}
|
||||||
else if (context == 'livetv') {
|
else if (context == 'livetv') {
|
||||||
|
|
||||||
Dashboard.setPageTitle(Globalize.translate('TitleLiveTV'));
|
LibraryMenu.setTitle(Globalize.translate('TitleLiveTV'));
|
||||||
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV');
|
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV');
|
||||||
}
|
}
|
||||||
else if (context == 'notifications') {
|
else if (context == 'notifications') {
|
||||||
|
|
||||||
$('.notificationsTabs', page).show();
|
$('.notificationsTabs', page).show();
|
||||||
|
|
||||||
Dashboard.setPageTitle(Globalize.translate('TitleNotifications'));
|
LibraryMenu.setTitle(Globalize.translate('TitleNotifications'));
|
||||||
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Notifications');
|
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Notifications');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Plugins');
|
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Plugins');
|
||||||
Dashboard.setPageTitle(Globalize.translate('TitlePlugins'));
|
LibraryMenu.setTitle(Globalize.translate('TitlePlugins'));
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -83,15 +83,15 @@
|
||||||
var context = getParameterByName('context');
|
var context = getParameterByName('context');
|
||||||
|
|
||||||
if (context == 'sync') {
|
if (context == 'sync') {
|
||||||
Dashboard.setPageTitle(Globalize.translate('TitleSync'));
|
LibraryMenu.setTitle(Globalize.translate('TitleSync'));
|
||||||
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Sync');
|
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Sync');
|
||||||
}
|
}
|
||||||
else if (context == 'livetv') {
|
else if (context == 'livetv') {
|
||||||
Dashboard.setPageTitle(Globalize.translate('TitleLiveTV'));
|
LibraryMenu.setTitle(Globalize.translate('TitleLiveTV'));
|
||||||
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV');
|
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV');
|
||||||
}
|
}
|
||||||
else if (context == 'notifications') {
|
else if (context == 'notifications') {
|
||||||
Dashboard.setPageTitle(Globalize.translate('TitleNotifications'));
|
LibraryMenu.setTitle(Globalize.translate('TitleNotifications'));
|
||||||
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Notifications');
|
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Notifications');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -100,8 +100,6 @@
|
||||||
|
|
||||||
var context = params.context;
|
var context = params.context;
|
||||||
|
|
||||||
LibraryMenu.setBackButtonVisible(true);
|
|
||||||
|
|
||||||
LibraryBrowser.renderName(item, page.querySelector('.itemName'), false, context);
|
LibraryBrowser.renderName(item, page.querySelector('.itemName'), false, context);
|
||||||
LibraryBrowser.renderParentName(item, page.querySelector('.parentName'), context);
|
LibraryBrowser.renderParentName(item, page.querySelector('.parentName'), context);
|
||||||
LibraryMenu.setTitle(item.SeriesName || item.Name);
|
LibraryMenu.setTitle(item.SeriesName || item.Name);
|
||||||
|
|
|
@ -361,7 +361,6 @@
|
||||||
view.addEventListener('viewbeforeshow', function (e) {
|
view.addEventListener('viewbeforeshow', function (e) {
|
||||||
reloadItems(view);
|
reloadItems(view);
|
||||||
updateFilterControls();
|
updateFilterControls();
|
||||||
LibraryMenu.setBackButtonVisible(params.context);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
view.addEventListener('viewdestroy', function (e) {
|
view.addEventListener('viewdestroy', function (e) {
|
||||||
|
|
|
@ -423,7 +423,7 @@
|
||||||
includeParentInfo: false
|
includeParentInfo: false
|
||||||
});
|
});
|
||||||
|
|
||||||
Dashboard.setPageTitle(name);
|
LibraryMenu.setTitle(name);
|
||||||
|
|
||||||
if (linkToElement) {
|
if (linkToElement) {
|
||||||
nameElem.innerHTML = '<a class="detailPageParentLink" href="' + LibraryBrowser.getHref(item, context) + '">' + name + '</a>';
|
nameElem.innerHTML = '<a class="detailPageParentLink" href="' + LibraryBrowser.getHref(item, context) + '">' + name + '</a>';
|
||||||
|
|
|
@ -368,7 +368,7 @@
|
||||||
|
|
||||||
var documentTitle = secondaryTitle;
|
var documentTitle = secondaryTitle;
|
||||||
|
|
||||||
Dashboard.setPageTitle(title, documentTitle);
|
LibraryMenu.setTitle(title, documentTitle);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
link.classList.remove('selectedSidebarLink');
|
link.classList.remove('selectedSidebarLink');
|
||||||
|
@ -697,19 +697,8 @@
|
||||||
if (libraryMenuButtonText) {
|
if (libraryMenuButtonText) {
|
||||||
libraryMenuButtonText.innerHTML = html;
|
libraryMenuButtonText.innerHTML = html;
|
||||||
}
|
}
|
||||||
},
|
|
||||||
|
|
||||||
setBackButtonVisible: function (visible) {
|
document.title = title;
|
||||||
|
|
||||||
var backButton = document.querySelector('.headerBackButton');
|
|
||||||
|
|
||||||
if (backButton) {
|
|
||||||
if (visible) {
|
|
||||||
backButton.classList.remove('hide');
|
|
||||||
} else {
|
|
||||||
backButton.classList.add('hide');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
setTransparentMenu: function (transparent) {
|
setTransparentMenu: function (transparent) {
|
||||||
|
@ -908,15 +897,8 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
function updateTitle(page) {
|
function updateTitle(page) {
|
||||||
var title = page.getAttribute('data-title') || page.getAttribute('data-contextname');
|
|
||||||
|
|
||||||
if (!title) {
|
var title = page.getAttribute('data-title');
|
||||||
var titleKey = getParameterByName('titlekey');
|
|
||||||
|
|
||||||
if (titleKey) {
|
|
||||||
title = Globalize.translate(titleKey);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (title) {
|
if (title) {
|
||||||
LibraryMenu.setTitle(title);
|
LibraryMenu.setTitle(title);
|
||||||
|
@ -925,18 +907,10 @@
|
||||||
|
|
||||||
function updateBackButton(page) {
|
function updateBackButton(page) {
|
||||||
|
|
||||||
var canGoBack = !page.classList.contains('homePage') && history.length > 0;
|
|
||||||
|
|
||||||
var backButton = document.querySelector('.headerBackButton');
|
var backButton = document.querySelector('.headerBackButton');
|
||||||
|
|
||||||
var showBackButton = AppInfo.enableBackButton;
|
|
||||||
|
|
||||||
if (!showBackButton) {
|
|
||||||
showBackButton = page.getAttribute('data-backbutton') == 'true';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (backButton) {
|
if (backButton) {
|
||||||
if (canGoBack && showBackButton) {
|
if (Emby.Page.canGoBack()) {
|
||||||
backButton.classList.remove('hide');
|
backButton.classList.remove('hide');
|
||||||
} else {
|
} else {
|
||||||
backButton.classList.add('hide');
|
backButton.classList.add('hide');
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
uploadUserImage.value = '';
|
uploadUserImage.value = '';
|
||||||
uploadUserImage.dispatchEvent(new CustomEvent('change', {}));
|
uploadUserImage.dispatchEvent(new CustomEvent('change', {}));
|
||||||
|
|
||||||
Dashboard.setPageTitle(user.Name);
|
LibraryMenu.setTitle(user.Name);
|
||||||
|
|
||||||
var imageUrl;
|
var imageUrl;
|
||||||
|
|
||||||
|
|
|
@ -591,16 +591,6 @@ var Dashboard = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
setPageTitle: function (title, documentTitle) {
|
|
||||||
|
|
||||||
LibraryMenu.setTitle(title || 'Emby');
|
|
||||||
|
|
||||||
documentTitle = documentTitle || title;
|
|
||||||
if (documentTitle) {
|
|
||||||
document.title = documentTitle;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
getSupportedRemoteCommands: function () {
|
getSupportedRemoteCommands: function () {
|
||||||
|
|
||||||
// Full list
|
// Full list
|
||||||
|
@ -966,8 +956,6 @@ var AppInfo = {};
|
||||||
|
|
||||||
AppInfo.hasPhysicalVolumeButtons = isCordova || browserInfo.mobile;
|
AppInfo.hasPhysicalVolumeButtons = isCordova || browserInfo.mobile;
|
||||||
|
|
||||||
AppInfo.enableBackButton = isIOS && (window.navigator.standalone || AppInfo.isNativeApp);
|
|
||||||
|
|
||||||
if (isCordova && isIOS) {
|
if (isCordova && isIOS) {
|
||||||
AppInfo.moreIcon = 'more-horiz';
|
AppInfo.moreIcon = 'more-horiz';
|
||||||
} else {
|
} else {
|
||||||
|
@ -2111,7 +2099,8 @@ var AppInfo = {};
|
||||||
dependencies: [],
|
dependencies: [],
|
||||||
autoFocus: false,
|
autoFocus: false,
|
||||||
controller: 'scripts/indexpage',
|
controller: 'scripts/indexpage',
|
||||||
transition: 'fade'
|
transition: 'fade',
|
||||||
|
type: 'home'
|
||||||
});
|
});
|
||||||
|
|
||||||
defineRoute({
|
defineRoute({
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
$('.lnkEditUserPreferences', page).attr('href', 'mypreferencesmenu.html?userId=' + user.Id);
|
$('.lnkEditUserPreferences', page).attr('href', 'mypreferencesmenu.html?userId=' + user.Id);
|
||||||
|
|
||||||
Dashboard.setPageTitle(user.Name);
|
LibraryMenu.setTitle(user.Name);
|
||||||
|
|
||||||
$('#txtUserName', page).val(user.Name);
|
$('#txtUserName', page).val(user.Name);
|
||||||
$('#txtConnectUserName', page).val(currentUser.ConnectUserName);
|
$('#txtConnectUserName', page).val(currentUser.ConnectUserName);
|
||||||
|
|
|
@ -90,7 +90,7 @@
|
||||||
|
|
||||||
$(page).trigger('userloaded', [user]);
|
$(page).trigger('userloaded', [user]);
|
||||||
|
|
||||||
Dashboard.setPageTitle(user.Name);
|
LibraryMenu.setTitle(user.Name);
|
||||||
|
|
||||||
loadChannels(page, user, channels);
|
loadChannels(page, user, channels);
|
||||||
loadMediaFolders(page, user, mediaFolders);
|
loadMediaFolders(page, user, mediaFolders);
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
|
|
||||||
function loadUser(page, user, allParentalRatings) {
|
function loadUser(page, user, allParentalRatings) {
|
||||||
|
|
||||||
Dashboard.setPageTitle(user.Name);
|
LibraryMenu.setTitle(user.Name);
|
||||||
|
|
||||||
loadUnratedItems(page, user);
|
loadUnratedItems(page, user);
|
||||||
loadBlockedTags(page, user.Policy.BlockedTags);
|
loadBlockedTags(page, user.Policy.BlockedTags);
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
function loadUser(page, user) {
|
function loadUser(page, user) {
|
||||||
|
|
||||||
Dashboard.setPageTitle(user.Name);
|
LibraryMenu.setTitle(user.Name);
|
||||||
|
|
||||||
if (user.ConnectLinkType == 'Guest') {
|
if (user.ConnectLinkType == 'Guest') {
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
Dashboard.getCurrentUser().then(function (loggedInUser) {
|
Dashboard.getCurrentUser().then(function (loggedInUser) {
|
||||||
|
|
||||||
Dashboard.setPageTitle(user.Name);
|
LibraryMenu.setTitle(user.Name);
|
||||||
|
|
||||||
var showPasswordSection = true;
|
var showPasswordSection = true;
|
||||||
var showLocalAccessSection = false;
|
var showLocalAccessSection = false;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="searchPage" data-role="page" class="page libraryPage allLibraryPage noSecondaryNavPage" data-title="${ButtonSearch}" data-backbutton="true" style="padding-top:0!important;">
|
<div id="searchPage" data-role="page" class="page libraryPage allLibraryPage noSecondaryNavPage" data-title="${ButtonSearch}" style="padding-top:0!important;">
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
@media all and (max-width: 800px) {
|
@media all and (max-width: 800px) {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="secondaryItemsPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-backbutton="true" data-menubutton="false">
|
<div id="secondaryItemsPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-menubutton="false">
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="viewSettings">
|
<div class="viewSettings">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue