Lightbox v3 (#711)

osunyorg · Nov 4, 2024 · 1da8a47 · 1da8a47
1 parent e84cc50
commit 1da8a47
Show file tree

Hide file tree

Showing 26 changed files with 445 additions and 638 deletions.
diff --git a/assets/js/theme/components/events.js b/assets/js/theme/components/events.js
@@ -4,11 +4,11 @@ window.osuny.components = window.osuny.components || {};
 
 window.osuny.components.events = {
     components: {
-        lightbox: null,
         carousel: null
     },
     handleKeyDownEvent: function (e) {
         var target = this._targetDirector();
+
         if (target) {
             if (e.key === 'ArrowLeft') {
                 target.previous();
@@ -19,18 +19,10 @@ window.osuny.components.events = {
     },
     //  who receives the event depending on lightbox state and carousels
     _targetDirector () {
-        if (this._isLightBoxOpened()) {
-            return this.components.lightbox;
-        }
-        if (this._hasFocusedCarousel()) {
+        if (this._hasFocusedCarousel() && !window.osuny.lightbox.state.opened) {
             return this.components.carousel.focusedCarousel;
         }
     },
-    _isLightBoxOpened () {
-        if (this.components.lightbox) {
-            return this.components.lightbox.container.opened;
-        }
-    },
     _hasFocusedCarousel () {
         if (this.components.carousel) {
             return this.components.carousel.focusedCarousel;

diff --git a/assets/js/theme/components/lightbox.js b/assets/js/theme/components/lightbox.js
diff --git a/assets/js/theme/components/lightbox/classes.js b/assets/js/theme/components/lightbox/classes.js
diff --git a/assets/js/theme/components/lightbox/container.js b/assets/js/theme/components/lightbox/container.js
diff --git a/assets/js/theme/components/lightbox/controls.js b/assets/js/theme/components/lightbox/controls.js
diff --git a/assets/js/theme/components/lightbox/events.js b/assets/js/theme/components/lightbox/events.js
diff --git a/assets/js/theme/components/lightbox/lightbox.js b/assets/js/theme/components/lightbox/lightbox.js