Merge branch 'main' of github.com:monochrome-music/monochrome
This commit is contained in:
commit
3fbd4492db
2 changed files with 4 additions and 3 deletions
4
bun.lock
4
bun.lock
|
|
@ -18,7 +18,7 @@
|
||||||
"@svta/common-media-library": "^0.18.1",
|
"@svta/common-media-library": "^0.18.1",
|
||||||
"@types/wicg-file-system-access": "^2023.10.7",
|
"@types/wicg-file-system-access": "^2023.10.7",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.57.2",
|
"@typescript-eslint/eslint-plugin": "^8.57.2",
|
||||||
"@uimaxbai/am-lyrics": "^1.1.4",
|
"@uimaxbai/am-lyrics": "^1.1.7",
|
||||||
"@vitest/web-worker": "^4.1.2",
|
"@vitest/web-worker": "^4.1.2",
|
||||||
"appwrite": "^23.0.0",
|
"appwrite": "^23.0.0",
|
||||||
"butterchurn": "^2.6.7",
|
"butterchurn": "^2.6.7",
|
||||||
|
|
@ -675,7 +675,7 @@
|
||||||
|
|
||||||
"@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.58.0", "", { "dependencies": { "@typescript-eslint/types": "8.58.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-XJ9UD9+bbDo4a4epraTwG3TsNPeiB9aShrUneAVXy8q4LuwowN+qu89/6ByLMINqvIMeI9H9hOHQtg/ijrYXzQ=="],
|
"@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.58.0", "", { "dependencies": { "@typescript-eslint/types": "8.58.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-XJ9UD9+bbDo4a4epraTwG3TsNPeiB9aShrUneAVXy8q4LuwowN+qu89/6ByLMINqvIMeI9H9hOHQtg/ijrYXzQ=="],
|
||||||
|
|
||||||
"@uimaxbai/am-lyrics": ["@uimaxbai/am-lyrics@1.1.4", "", { "dependencies": { "@babel/runtime": "^7.27.6", "lit": "^3.1.4" }, "peerDependencies": { "@lit/react": "^1.0.0", "react": ">=17.0.0" }, "optionalPeers": ["@lit/react", "react"] }, "sha512-LEwvbfgz6o71kYTq1vMlfou/powr8q4CJQWuyL2H48Dwo1/vH59SKiB3nz/WOEQ1S69uaSmfqf8Prtx6+ZNIrQ=="],
|
"@uimaxbai/am-lyrics": ["@uimaxbai/am-lyrics@1.1.7", "", { "dependencies": { "@babel/runtime": "^7.27.6", "lit": "^3.1.4" }, "peerDependencies": { "@lit/react": "^1.0.0", "react": ">=17.0.0" }, "optionalPeers": ["@lit/react", "react"] }, "sha512-hEwPl4dFmJ08sJf4VBaR7k7yxA3BNaoINS89j0KrkSFJYpCkohHDy24AIfzEMonPloJ3H6HBA55nCFMnAzm50w=="],
|
||||||
|
|
||||||
"@vitest/browser": ["@vitest/browser@4.1.2", "", { "dependencies": { "@blazediff/core": "1.9.1", "@vitest/mocker": "4.1.2", "@vitest/utils": "4.1.2", "magic-string": "^0.30.21", "pngjs": "^7.0.0", "sirv": "^3.0.2", "tinyrainbow": "^3.1.0", "ws": "^8.19.0" }, "peerDependencies": { "vitest": "4.1.2" } }, "sha512-CwdIf90LNf1Zitgqy63ciMAzmyb4oIGs8WZ40VGYrWkssQKeEKr32EzO8MKUrDPPcPVHFI9oQ5ni2Hp24NaNRQ=="],
|
"@vitest/browser": ["@vitest/browser@4.1.2", "", { "dependencies": { "@blazediff/core": "1.9.1", "@vitest/mocker": "4.1.2", "@vitest/utils": "4.1.2", "magic-string": "^0.30.21", "pngjs": "^7.0.0", "sirv": "^3.0.2", "tinyrainbow": "^3.1.0", "ws": "^8.19.0" }, "peerDependencies": { "vitest": "4.1.2" } }, "sha512-CwdIf90LNf1Zitgqy63ciMAzmyb4oIGs8WZ40VGYrWkssQKeEKr32EzO8MKUrDPPcPVHFI9oQ5ni2Hp24NaNRQ=="],
|
||||||
|
|
||||||
|
|
|
||||||
3
js/ui.js
3
js/ui.js
|
|
@ -1324,6 +1324,7 @@ export class UIRenderer {
|
||||||
window.history.pushState({ fullscreen: true }, '', '#fullscreen');
|
window.history.pushState({ fullscreen: true }, '', '#fullscreen');
|
||||||
}
|
}
|
||||||
const overlay = document.getElementById('fullscreen-cover-overlay');
|
const overlay = document.getElementById('fullscreen-cover-overlay');
|
||||||
|
const isAlreadyOpen = overlay && window.getComputedStyle(overlay).display !== 'none';
|
||||||
const nextTrackEl = document.getElementById('fullscreen-next-track');
|
const nextTrackEl = document.getElementById('fullscreen-next-track');
|
||||||
const lyricsPane = document.getElementById('fullscreen-lyrics-pane');
|
const lyricsPane = document.getElementById('fullscreen-lyrics-pane');
|
||||||
const lyricsContent = document.getElementById('fullscreen-lyrics-content');
|
const lyricsContent = document.getElementById('fullscreen-lyrics-content');
|
||||||
|
|
@ -1366,7 +1367,7 @@ export class UIRenderer {
|
||||||
sidePanelManager.close();
|
sidePanelManager.close();
|
||||||
}
|
}
|
||||||
const mainContent = document.querySelector('.main-content');
|
const mainContent = document.querySelector('.main-content');
|
||||||
if (mainContent instanceof HTMLElement) {
|
if (mainContent instanceof HTMLElement && !isAlreadyOpen) {
|
||||||
const computedStyles = window.getComputedStyle(mainContent);
|
const computedStyles = window.getComputedStyle(mainContent);
|
||||||
this.fullscreenMainContentOverflow = {
|
this.fullscreenMainContentOverflow = {
|
||||||
overflow: mainContent.style.overflow,
|
overflow: mainContent.style.overflow,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue