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 currentViewId

Browse source
This commit is contained in:
grafixeyehero 2022-06-29 04:27:48 +03:00
parent ab02f210ca
commit 11256c0171
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/index.html
View file

@ -155,10 +155,9 @@
<div class="mainDrawer-scrollContainer scrollContainer focuscontainer-y"></div> <div class="mainDrawer-scrollContainer scrollContainer focuscontainer-y"></div>
</div> </div>
<div class="skinHeader focuscontainer-x"></div> <div class="skinHeader focuscontainer-x"></div>
<div class="mainAnimatedPages skinBody"> <div id="reactRoot" class="mainAnimatedPages skinBody">
<div class="splashLogo"></div> <div class="splashLogo"></div>
</div> </div>
<div id="reactRoot"></div>
<div class="mainDrawerHandle"></div> <div class="mainDrawerHandle"></div>
</body> </body>
</html> </html>

2
src/routes/index.tsx
View file

@ -47,7 +47,7 @@ const AppRoutes = () => (
} }
/> />
<Route <Route
path='userLibraryAccessPage.html' path='userlibraryaccess.html'
element={ element={
<ConnectionRequired> <ConnectionRequired>
<UserLibraryAccessPage /> <UserLibraryAccessPage />

16
src/scripts/libraryMenu.js
View file

@ -355,14 +355,14 @@ import '../assets/css/flexstyles.scss';
} }
} }
function refreshDashboardInfoInDrawer(apiClient) { function refreshDashboardInfoInDrawer(page, apiClient) {
currentDrawerType = 'admin'; currentDrawerType = 'admin';
loadNavDrawer(); loadNavDrawer();
if (navDrawerScrollContainer.querySelector('.adminDrawerLogo')) { if (navDrawerScrollContainer.querySelector('.adminDrawerLogo')) {
updateDashboardMenuSelectedItem(); updateDashboardMenuSelectedItem(page);
} else { } else {
createDashboardMenu(apiClient); createDashboardMenu(page, apiClient);
} }
} }
@ -370,9 +370,9 @@ import '../assets/css/flexstyles.scss';
return window.location.href.toString().toLowerCase().indexOf(url.toLowerCase()) !== -1; return window.location.href.toString().toLowerCase().indexOf(url.toLowerCase()) !== -1;
} }
function updateDashboardMenuSelectedItem() { function updateDashboardMenuSelectedItem(page) {
const links = navDrawerScrollContainer.querySelectorAll('.navMenuOption'); const links = navDrawerScrollContainer.querySelectorAll('.navMenuOption');
const currentViewId = viewManager.currentView().id; const currentViewId = page.id;
for (let i = 0, length = links.length; i < length; i++) { for (let i = 0, length = links.length; i < length; i++) {
let link = links[i]; let link = links[i];
@ -590,7 +590,7 @@ import '../assets/css/flexstyles.scss';
}); });
} }
function createDashboardMenu(apiClient) { function createDashboardMenu(page, apiClient) {
return getToolsMenuHtml(apiClient).then(function (toolsMenuHtml) { return getToolsMenuHtml(apiClient).then(function (toolsMenuHtml) {
let html = ''; let html = '';
html += '<a class="adminDrawerLogo clearLink" is="emby-linkbutton" href="#/home.html">'; html += '<a class="adminDrawerLogo clearLink" is="emby-linkbutton" href="#/home.html">';
@ -598,7 +598,7 @@ import '../assets/css/flexstyles.scss';
html += '</a>'; html += '</a>';
html += toolsMenuHtml; html += toolsMenuHtml;
navDrawerScrollContainer.innerHTML = html; navDrawerScrollContainer.innerHTML = html;
updateDashboardMenuSelectedItem(); updateDashboardMenuSelectedItem(page);
}); });
} }
@ -1017,7 +1017,7 @@ import '../assets/css/flexstyles.scss';
mainDrawerButton.classList.remove('hide'); mainDrawerButton.classList.remove('hide');
} }
refreshDashboardInfoInDrawer(apiClient); refreshDashboardInfoInDrawer(page, apiClient);
} else { } else {
if (mainDrawerButton) { if (mainDrawerButton) {
if (enableLibraryNavDrawer || (isHomePage && enableLibraryNavDrawerHome)) { if (enableLibraryNavDrawer || (isHomePage && enableLibraryNavDrawerHome)) {