mirror of
https://github.com/PR0M3TH3AN/bitvid.git
synced 2026-11-10 23:01:10 +00:00
Merge pull request #334 from PR0M3TH3AN/codex/add-profile-modal-controller-methods
Add profile modal helper implementations to controller
This commit is contained in:
10 files changed
+1970
-84
No files matched your search
@@ -5,7 +5,7 @@
|
||||
<title>bitvid Whitelist Application Form</title>
|
||||
<!-- Link to your main stylesheet -->
|
||||
|
||||
<link rel="stylesheet" href="../../css/style.css?v=2024.10.24" />
|
||||
<link rel="stylesheet" href="../../css/style.css?v=2024.10.29" />
|
||||
|
||||
<style>
|
||||
/* Override for form page to match modal field styling */
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<title>bitvid Bug Report Form</title>
|
||||
<!-- Link to your main stylesheet -->
|
||||
|
||||
<link rel="stylesheet" href="../../css/style.css?v=2024.10.24" />
|
||||
<link rel="stylesheet" href="../../css/style.css?v=2024.10.29" />
|
||||
|
||||
<style>
|
||||
/* Override for form page to match modal field styling */
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<title>bitvid Content Appeals Form</title>
|
||||
<!-- Link to your main stylesheet -->
|
||||
|
||||
<link rel="stylesheet" href="../../css/style.css?v=2024.10.24" />
|
||||
<link rel="stylesheet" href="../../css/style.css?v=2024.10.29" />
|
||||
|
||||
<style>
|
||||
/* Override for form page to match modal field styling */
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<title>bitvid General Feedback Form</title>
|
||||
<!-- Link to your main stylesheet -->
|
||||
|
||||
<link rel="stylesheet" href="../../css/style.css?v=2024.10.24" />
|
||||
<link rel="stylesheet" href="../../css/style.css?v=2024.10.29" />
|
||||
|
||||
<style>
|
||||
/* Override for form page to match modal field styling */
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<meta charset="utf-8" />
|
||||
<title>bitvid Feature Request Form</title>
|
||||
<!-- Link to your main stylesheet -->
|
||||
<link rel="stylesheet" href="../../css/style.css?v=2024.10.24" />
|
||||
<link rel="stylesheet" href="../../css/style.css?v=2024.10.29" />
|
||||
<style>
|
||||
/* Override for form page to match modal field styling */
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
export const ASSET_VERSION = "2024.10.24";
|
||||
export const ASSET_VERSION = "2024.10.29";
|
||||
+7
-6
@@ -23,12 +23,12 @@
|
||||
--scrollbar-thumb: rgba(255, 255, 255, 0.3);
|
||||
--scrollbar-thumb-hover: rgba(255, 255, 255, 0.4);
|
||||
/* Sidebar stack must remain below modal overlays. */
|
||||
--z-sidebar: 30;
|
||||
--z-sidebar-overlay: 20;
|
||||
--z-modal-root: 80;
|
||||
--z-modal-overlay: 70;
|
||||
--z-modal-content: 90;
|
||||
--z-modal-player: 120;
|
||||
--z-sidebar-overlay: 10;
|
||||
--z-sidebar: 20;
|
||||
--z-modal-root: 100;
|
||||
--z-modal-overlay: 110;
|
||||
--z-modal-content: 120;
|
||||
--z-modal-player: 130;
|
||||
--sidebar-width-expanded: 16rem;
|
||||
--sidebar-width-collapsed: 4rem;
|
||||
--sidebar-width: var(--sidebar-width-expanded);
|
||||
@@ -546,6 +546,7 @@ header img {
|
||||
inset: 0;
|
||||
z-index: var(--z-modal-root);
|
||||
pointer-events: none;
|
||||
isolation: isolate;
|
||||
}
|
||||
|
||||
#modalContainer > * {
|
||||
|
||||
+14
-14
@@ -50,10 +50,10 @@
|
||||
so browsers pick up the latest sidebar markup and styling without
|
||||
hard-refreshing around CDN caches.
|
||||
-->
|
||||
<script src="js/tracking.js?v=2024.10.24" defer></script>
|
||||
<link href="css/tailwind.generated.css?v=2024.10.24" rel="stylesheet" />
|
||||
<link href="css/style.css?v=2024.10.24" rel="stylesheet" />
|
||||
<link href="css/markdown.css?v=2024.10.24" rel="stylesheet" />
|
||||
<script src="js/tracking.js?v=2024.10.29" defer></script>
|
||||
<link href="css/tailwind.generated.css?v=2024.10.29" rel="stylesheet" />
|
||||
<link href="css/style.css?v=2024.10.29" rel="stylesheet" />
|
||||
<link href="css/markdown.css?v=2024.10.29" rel="stylesheet" />
|
||||
</head>
|
||||
<body class="sidebar-collapsed">
|
||||
<!--
|
||||
@@ -215,16 +215,16 @@
|
||||
|
||||
<!-- Additional Scripts -->
|
||||
<!-- Bootstraps nostr-tools before other modules rely on nostrToolsReady -->
|
||||
<script type="module" src="js/nostrToolsBootstrap.js?v=2024.10.24"></script>
|
||||
<script type="module" src="js/config.js?v=2024.10.24"></script>
|
||||
<script type="module" src="js/lists.js?v=2024.10.24"></script>
|
||||
<script type="module" src="js/accessControl.js?v=2024.10.24"></script>
|
||||
<script type="module" src="js/webtorrent.js?v=2024.10.24"></script>
|
||||
<script type="module" src="js/nostr.js?v=2024.10.24"></script>
|
||||
<script type="module" src="js/viewManager.js?v=2024.10.24"></script>
|
||||
<script type="module" src="js/bootstrap.js?v=2024.10.24"></script>
|
||||
<script type="module" src="js/disclaimer.js?v=2024.10.24"></script>
|
||||
<script type="module" src="js/index.js?v=2024.10.24"></script>
|
||||
<script type="module" src="js/nostrToolsBootstrap.js?v=2024.10.29"></script>
|
||||
<script type="module" src="js/config.js?v=2024.10.29"></script>
|
||||
<script type="module" src="js/lists.js?v=2024.10.29"></script>
|
||||
<script type="module" src="js/accessControl.js?v=2024.10.29"></script>
|
||||
<script type="module" src="js/webtorrent.js?v=2024.10.29"></script>
|
||||
<script type="module" src="js/nostr.js?v=2024.10.29"></script>
|
||||
<script type="module" src="js/viewManager.js?v=2024.10.29"></script>
|
||||
<script type="module" src="js/bootstrap.js?v=2024.10.29"></script>
|
||||
<script type="module" src="js/disclaimer.js?v=2024.10.29"></script>
|
||||
<script type="module" src="js/index.js?v=2024.10.29"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.7.0/highlight.min.js"></script>
|
||||
</body>
|
||||
|
||||
@@ -8876,8 +8876,31 @@ class Application {
|
||||
const sanitizedUrl = typeof url === "string" ? url.trim() : "";
|
||||
const trimmedMagnet = typeof magnet === "string" ? magnet.trim() : "";
|
||||
|
||||
if (!this.modalVideo) {
|
||||
throw new Error("Video element is not ready for playback.");
|
||||
let modalVideoEl = this.modalVideo;
|
||||
if (!modalVideoEl && this.videoModal) {
|
||||
const maybeLoader = this.videoModal.load;
|
||||
if (typeof maybeLoader === "function") {
|
||||
try {
|
||||
await maybeLoader.call(this.videoModal);
|
||||
} catch (error) {
|
||||
this.log(
|
||||
"[playVideoWithFallback] Failed to load video modal before playback:",
|
||||
error
|
||||
);
|
||||
this.showError("Could not prepare the video player. Please try again.");
|
||||
return { source: null, error };
|
||||
}
|
||||
modalVideoEl = this.modalVideo;
|
||||
}
|
||||
}
|
||||
|
||||
if (!modalVideoEl) {
|
||||
const error = new Error("Video element is not ready for playback.");
|
||||
this.log(
|
||||
"[playVideoWithFallback] Video element missing after modal load attempt."
|
||||
);
|
||||
this.showError("Video player is not ready yet. Please try again.");
|
||||
return { source: null, error };
|
||||
}
|
||||
|
||||
if (
|
||||
@@ -8894,12 +8917,12 @@ class Application {
|
||||
}
|
||||
}
|
||||
|
||||
const modalVideoEl = this.modalVideo;
|
||||
const refreshedModal = this.teardownVideoElement(modalVideoEl, {
|
||||
replaceNode: true,
|
||||
});
|
||||
if (refreshedModal) {
|
||||
this.modalVideo = refreshedModal;
|
||||
modalVideoEl = this.modalVideo;
|
||||
}
|
||||
|
||||
const session = this.playbackService.createSession({
|
||||
|
||||
+1917
-55
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user