Merge branch 'master' into stable24

pulsejet · Dec 8, 2022 · eac4166 · eac4166
2 parents fced447 + 50b2756
commit eac4166
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/lib/Controller/AlbumsController.php b/lib/Controller/AlbumsController.php
@@ -55,6 +55,8 @@ public function albums(int $t = 0): JSONResponse
     /**
      * @NoAdminRequired
      *
+     * @UseSession
+     *
      * Download an album as a zip file
      */
     public function download(string $name = ''): JSONResponse

diff --git a/lib/Controller/DownloadController.php b/lib/Controller/DownloadController.php
@@ -36,6 +36,8 @@ class DownloadController extends ApiBase
      *
      * @PublicPage
      *
+     * @UseSession
+     *
      * Request to download one or more files
      */
     public function request(): JSONResponse
@@ -55,6 +57,8 @@ public function request(): JSONResponse
     /**
      * Get a handle for downloading files.
      *
+     * The calling controller must have the UseSession annotation.
+     *
      * @param string $name  Name of zip file
      * @param int[]  $files
      */

diff --git a/src/components/viewer/Viewer.vue b/src/components/viewer/Viewer.vue
@@ -1130,8 +1130,10 @@ export default class Viewer extends Mixins(GlobalMixin) {
 
   transition: opacity 0.2s ease-in-out;
   opacity: 0;
+  pointer-events: none;
   &.showControls {
     opacity: 1;
+    pointer-events: auto;
   }
 }
 
@@ -1143,6 +1145,7 @@ export default class Viewer extends Mixins(GlobalMixin) {
   position: fixed;
   bottom: 0;
   left: 0;
+  pointer-events: none;
 
   transition: opacity 0.2s ease-in-out;
   opacity: 0;