@unlk/keymaster 1.2.5 → 1.2.6

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.6] - 2025-11-10
+
+### Update
+- Video Modal JS
+
 ## [1.2.5] - 2025-11-05
 
 ### Update

package/dist/js/keymaster.js

@@ -1,5 +1,5 @@
 /*!
-  * Unlock Keymaster [object Object] v1.2.5 (https://unlock-com.github.io/keymaster)
+  * Unlock Keymaster [object Object] v1.2.6 (https://unlock-com.github.io/keymaster)
   * Copyright 2022-2025 Unlk Developers
   */
 (function (global, factory) {
@@ -7660,7 +7660,7 @@
 	defineJQueryPlugin(CarouselCaption);
 
 	const NAME = 'videoModal';
-	const EVENT_SHOWN = 'shown.bs.modal';
+	const EVENT_SHOW = 'show.bs.modal';
 	const EVENT_HIDDEN = 'hidden.bs.modal';
 	const SELECTOR_DIALOG = '.modal-dialog-media';
 	const SELECTOR_RATIO = '.ratio';
@@ -7700,58 +7700,36 @@
 	    this._vimeoUrl = this._container.getAttribute('data-vimeo-url');
 	    this._youtubePlayer = null;
 	    this._vimeoPlayer = null;
-	    EventHandler.on(this._element, EVENT_SHOWN, () => this._onShown());
+	    EventHandler.on(this._element, EVENT_SHOW, () => this._onShow());
 	    EventHandler.on(this._element, EVENT_HIDDEN, () => this._onHide());
 	  }
 	  dispose() {
 	    this._onHide();
 	    super.dispose();
 	  }
-	  async _onShown() {
-	    // Reset container each time
-	    this._container.innerHTML = '';
+	  async _onShow() {
+	    const {
+	      id
+	    } = this._element;
+	    const playerID = `video-${id}-youtube-player`;
 	    if (this._vimeoUrl) {
 	      await vimeoAPIInitPromise;
 	      const vimeoId = this._getVimeoId(this._vimeoUrl);
-	      if (!vimeoId) return;
 	      this._vimeoPlayer = new window.Vimeo.Player(this._container, {
 	        id: vimeoId,
-	        autoplay: true,
-	        muted: true,
-	        playsinline: true,
-	        dnt: true
+	        autoplay: true
 	      });
-	      this._vimeoPlayer.play?.().catch(() => {});
+	      return;
 	    }
 	    if (this._youtubeSrc) {
 	      await youTubeAPIInitPromise;
 	      const youtubeId = this._getYouTubeId(this._youtubeSrc);
-	      if (!youtubeId) {
-	        console.warn('[VideoModal] No YouTube ID parsed from', this._youtubeSrc);
-	        return;
-	      }
-	      const playerDiv = document.createElement('div');
-	      playerDiv.className = 'w-100 h-100';
-	      this._container.appendChild(playerDiv);
+	      const playerDiv = this._container.querySelector(`#${playerID}`);
 	      this._youtubePlayer = new window.YT.Player(playerDiv, {
 	        videoId: youtubeId,
-	        host: 'https://www.youtube-nocookie.com',
 	        playerVars: {
 	          autoplay: 1,
-	          rel: 0,
-	          playsinline: 1,
-	          origin: window.location.origin
-	        },
-	        events: {
-	          onReady: e => {
-	            try {
-	              e.target.mute();
-	            } catch {}
-	            try {
-	              e.target.playVideo();
-	            } catch {}
-	          },
-	          onError: e => console.warn('[VideoModal] YT error', e?.data)
+	          rel: 0
 	        }
 	      });
 	    }
@@ -7762,21 +7740,16 @@
 	      this._vimeoPlayer = null;
 	    }
 	    if (this._youtubePlayer) {
-	      try {
-	        this._youtubePlayer.destroy();
-	      } catch {}
+	      this._youtubePlayer.destroy();
 	      this._youtubePlayer = null;
 	    }
-	    this._container.innerHTML = '';
 	  }
 	  _getYouTubeId(url) {
-	    if (!url) return '';
-	    // robust: supports v=, youtu.be/, embed/, shorts/
-	    const m = String(url).match(/(?:v=|youtu\.be\/|embed\/|shorts\/)([\w-]{11})/);
-	    return m ? m[1] : '';
+	    const match = url.match(/(?:youtube\.com\/(?:watch\?v=|embed\/|v\/)|youtu\.be\/)([\w-]{11})/);
+	    return match ? match[1] : '';
 	  }
 	  _getVimeoId(url) {
-	    const match = String(url).match(/vimeo\.com\/(\d+)/);
+	    const match = url.match(/vimeo\.com\/(\d+)/);
 	    return match ? match[1] : '';
 	  }
 	  static get NAME() {