myetv-player 1.0.6 → 1.0.10

package/dist/myetv-player.js

@@ -448,6 +448,8 @@ constructor(videoElement, options = {}) {
         dashLibUrl: 'https://cdn.dashjs.org/latest/dash.all.min.js', // Dash.js library URL
         hlsLibUrl: 'https://cdn.jsdelivr.net/npm/hls.js@latest', // HLS.js library URL
         adaptiveQualityControl: true, // Show quality control for adaptive streams
+        //seek shape
+        seekHandleShape: 'circle', // Available shape: none, circle, square, diamond, arrow, triangle, heart, star
         // AUDIO PLAYER
         audiofile: false,
         audiowave: false,
@@ -1531,14 +1533,19 @@ seek(e) {
     if (!this.video || !this.progressContainer || !this.progressFilled || !this.progressHandle || this.isChangingQuality) return;
 
     const rect = this.progressContainer.getBoundingClientRect();
-    const clickX = e.clientX - rect.left;
+
+    // Support both mouse and touch events
+    const clientX = e.clientX !== undefined ? e.clientX : (e.touches && e.touches[0] ? e.touches[0].clientX : (e.changedTouches && e.changedTouches[0] ? e.changedTouches[0].clientX : 0));
+
+    const clickX = clientX - rect.left;
     const percentage = Math.max(0, Math.min(1, clickX / rect.width));
 
     if (this.video.duration && !isNaN(this.video.duration)) {
         this.video.currentTime = percentage * this.video.duration;
-        const progress = percentage * 100;
-        this.progressFilled.style.width = progress + '%';
-        this.progressHandle.style.left = progress + '%';
+
+        const progress = `${percentage * 100}%`;
+        this.progressFilled.style.width = progress;
+        this.progressHandle.style.left = progress;
     }
 }
 
@@ -2091,6 +2098,51 @@ loadScript(src) {
     });
 }
 
+/**
+ * Set seek handle shape dynamically
+ * @param {string} shape - Shape type: none, circle, square, diamond, arrow, triangle, heart, star
+ * @returns {Object} this
+ */
+setSeekHandleShape(shape) {
+    const validShapes = ['none', 'circle', 'square', 'diamond', 'arrow', 'triangle', 'heart', 'star'];
+
+    if (!validShapes.includes(shape)) {
+        if (this.options.debug) console.warn('Invalid seek handle shape:', shape);
+        return this;
+    }
+
+    this.options.seekHandleShape = shape;
+
+    // Update handle class
+    if (this.progressHandle) {
+        // Remove all shape classes
+        validShapes.forEach(s => {
+            this.progressHandle.classList.remove(`progress-handle-${s}`);
+        });
+        // Add new shape class
+        this.progressHandle.classList.add(`progress-handle-${shape}`);
+    }
+
+    if (this.options.debug) console.log('Seek handle shape changed to:', shape);
+    return this;
+}
+
+/**
+ * Get current seek handle shape
+ * @returns {string} Current shape
+ */
+getSeekHandleShape() {
+    return this.options.seekHandleShape;
+}
+
+/**
+ * Get available seek handle shapes
+ * @returns {Array} Array of available shapes
+ */
+getAvailableSeekHandleShapes() {
+    return ['none', 'circle', 'square', 'diamond', 'arrow', 'triangle', 'heart', 'star'];
+}
+
 dispose() {
     if (this.qualityMonitorInterval) {
         clearInterval(this.qualityMonitorInterval);
@@ -2467,12 +2519,28 @@ addEventListener(eventType, callback) {
             });
         }
 
-        if (this.progressContainer) {
-            this.progressContainer.addEventListener('click', (e) => this.seek(e));
-            this.progressContainer.addEventListener('mousedown', (e) => this.startSeeking(e));
-        }
+    if (this.progressContainer) {
+        // Mouse events (desktop)
+        this.progressContainer.addEventListener('click', (e) => this.seek(e));
+        this.progressContainer.addEventListener('mousedown', (e) => this.startSeeking(e));
+
+        // Touch events (mobile)
+        this.progressContainer.addEventListener('touchstart', (e) => {
+            e.preventDefault(); // Prevent scrolling when touching the seek bar
+            this.startSeeking(e);
+        }, { passive: false });
 
         this.setupSeekTooltip();
+    }
+
+    // Add touch events directly on the handle for better mobile dragging
+    if (this.progressHandle) {
+        this.progressHandle.addEventListener('touchstart', (e) => {
+            e.preventDefault(); // Prevent default touch behavior
+            e.stopPropagation(); // Stop event from bubbling to progressContainer
+            this.startSeeking(e);
+        }, { passive: false });
+    }
 
         // NOTE: Auto-hide events are handled in initAutoHide() after everything is ready
 
@@ -2493,7 +2561,19 @@ addEventListener(eventType, callback) {
         document.addEventListener('mozfullscreenchange', () => this.updateFullscreenButton());
 
         document.addEventListener('mousemove', (e) => this.continueSeeking(e));
-        document.addEventListener('mouseup', () => this.endSeeking());
+    document.addEventListener('mouseup', () => this.endSeeking());
+
+    // Touch events for seeking (mobile)
+    document.addEventListener('touchmove', (e) => {
+        if (this.isUserSeeking) {
+            e.preventDefault(); // Prevent scrolling while seeking
+            this.continueSeeking(e);
+        }
+    }, { passive: false });
+
+    document.addEventListener('touchend', () => this.endSeeking());
+    document.addEventListener('touchcancel', () => this.endSeeking());
+
     }
 
 /* Controls Module for MYETV Video Player 
@@ -2501,7 +2581,7 @@ addEventListener(eventType, callback) {
  * Created by https://www.myetv.tv https://oskarcosimo.com 
  */
 
-/* AUTO-HIDE SYSTEM - IMPROVED AND COMPREHENSIVE */
+/* AUTO-HIDE SYSTEM */
 initAutoHide() {
     if (!this.options.autoHide) {
         if (this.options.debug) console.log('Auto-hide disabled in options');
@@ -2641,12 +2721,17 @@ showControlsNow() {
         this.controls.classList.add('show');
     }
 
-    // ADD THIS: Add has-controls class to container for watermark visibility
+    // Add has-controls class to container for watermark visibility
     if (this.container) {
         this.container.classList.add('has-controls');
+        this.updateControlbarHeight();
+        // Update watermark position
+        if (this.updateWatermarkPosition) {
+            this.updateWatermarkPosition();
+        }
     }
 
-    // Fix: Show title overlay with controls if not persistent
+    // Show title overlay with controls if not persistent
     if (this.options.showTitleOverlay && !this.options.persistentTitle && this.options.videoTitle) {
         this.showTitleOverlay();
     }
@@ -2657,32 +2742,44 @@ showControlsNow() {
 hideControlsNow() {
     // Don't hide if mouse is still over controls (allow hiding on touch devices)
     const isTouchDevice = 'ontouchstart' in window || navigator.maxTouchPoints > 0;
+
     if (this.mouseOverControls && !isTouchDevice) {
-        if (this.autoHideDebug && this.options.debug) console.log('⏸️ Not hiding - mouse still over controls');
+        if (this.autoHideDebug && this.options.debug) {
+            console.log('🚫 Not hiding - mouse still over controls');
+        }
         return;
     }
 
     // Don't hide if video is paused
     if (this.video && this.video.paused) {
-        if (this.autoHideDebug && this.options.debug) console.log('⏸️ Not hiding - video is paused');
+        if (this.autoHideDebug && this.options.debug) {
+            console.log('🚫 Not hiding - video is paused');
+        }
         return;
     }
 
     if (this.controls) {
         this.controls.classList.remove('show');
-    }
 
-    // ADD THIS: Remove has-controls class from container for watermark visibility
-    if (this.container) {
-        this.container.classList.remove('has-controls');
+        // Remove has-controls class from container for watermark visibility
+        if (this.container) {
+            this.container.classList.remove('has-controls');
+            this.updateControlbarHeight();
+            // Update watermark position
+            if (this.updateWatermarkPosition) {
+                this.updateWatermarkPosition();
+            }
+        }
     }
 
-    // Fix: Hide title overlay with controls if not persistent
+    // Hide title overlay with controls (if not persistent)
     if (this.options.showTitleOverlay && !this.options.persistentTitle) {
         this.hideTitleOverlay();
     }
 
-    if (this.autoHideDebug && this.options.debug) console.log('❌ Controls hidden');
+    if (this.autoHideDebug && this.options.debug) {
+        console.log('👁️ Controls hidden');
+    }
 }
 
 showControls() {
@@ -2851,7 +2948,7 @@ createControls() {
                 <div class="progress-bar">
                     <div class="progress-buffer"></div>
                     <div class="progress-filled"></div>
-                    <div class="progress-handle"></div>
+                    <div class="progress-handle progress-handle-${this.options.seekHandleShape}"></div>
                 </div>
                 ${this.options.showSeekTooltip ? '<div class="seek-tooltip">0:00</div>' : ''}
             </div>
@@ -2961,28 +3058,62 @@ createControls() {
     // NEW: Initialize responsive settings menu
     setTimeout(() => {
         this.initializeResponsiveMenu();
+        this.updateControlbarHeight();
     }, 100);
 }
 
-/* NEW: Initialize responsive menu with dynamic width calculation */
+/* Initialize responsive menu with dynamic width calculation */
 initializeResponsiveMenu() {
     if (!this.controls) return;
 
     // Track screen size
     this.isSmallScreen = false;
 
-    // Check initial size and set up listener
+    // Check initial size
     this.checkScreenSize();
 
-    window.addEventListener('resize', () => {
+    // Bind resize handler with updateControlbarHeight
+    const resizeHandler = () => {
         this.checkScreenSize();
-    });
+        this.updateControlbarHeight();
+    };
+
+    // Bind del context
+    this.resizeHandler = resizeHandler.bind(this);
+    window.addEventListener('resize', this.resizeHandler);
 
     // Bind events for settings menu
     this.bindSettingsMenuEvents();
 }
 
-/* NEW: Dynamic width calculation based on logo presence */
+// Dynamic controlbar height tracking for watermark positioning
+updateControlbarHeight() {
+    if (!this.controls) return;
+
+    const height = this.controls.offsetHeight;
+    if (this.container) {
+
+        this.container.style.setProperty('--player-controls-height', `${height}px`);
+
+        const watermark = this.container.querySelector('.video-watermark.watermark-bottomleft, .video-watermark.watermark-bottomright');
+        if (watermark) {
+            const hasControls = this.container.classList.contains('has-controls');
+            const isHideOnAutoHide = watermark.classList.contains('hide-on-autohide');
+
+            if (hasControls || !isHideOnAutoHide) {
+                watermark.style.bottom = `${height + 15}px`;
+            } else {
+                watermark.style.bottom = '15px';
+            }
+        }
+    }
+
+    if (this.options.debug) {
+        console.log(`Controlbar height updated: ${height}px`);
+    }
+}
+
+/* Dynamic width calculation based on logo presence */
 getResponsiveThreshold() {
     // Check if brand logo is enabled and present
     const hasLogo = this.options.brandLogoEnabled && this.options.brandLogoUrl;
@@ -2991,7 +3122,7 @@ getResponsiveThreshold() {
     return hasLogo ? 650 : 550;
 }
 
-/* NEW: Check if screen is under dynamic threshold */
+/* Check if screen is under dynamic threshold */
 checkScreenSize() {
     const threshold = this.getResponsiveThreshold();
     const newIsSmallScreen = window.innerWidth <= threshold;
@@ -3001,12 +3132,12 @@ checkScreenSize() {
         this.updateSettingsMenuVisibility();
 
         if (this.options.debug) {
-            console.log(`Screen check: ${window.innerWidth}px vs ${threshold}px threshold (logo: ${this.options.brandLogoEnabled}), small: ${this.isSmallScreen}`);
+            console.log(`Screen check: ${window.innerWidth}px vs ${threshold}px (threshold), logo: ${this.options.brandLogoEnabled}, small: ${this.isSmallScreen}`);
         }
     }
 }
 
-/* NEW: Update settings menu visibility based on screen size */
+/* Update settings menu visibility based on screen size */
 updateSettingsMenuVisibility() {
     const settingsControl = this.controls?.querySelector('.settings-control');
     if (!settingsControl) return;
@@ -3046,7 +3177,7 @@ updateSettingsMenuVisibility() {
     }
 }
 
-/* NEW: Populate settings menu with controls */
+/* Populate settings menu with controls */
 populateSettingsMenu() {
     const settingsMenu = this.controls?.querySelector('.settings-menu');
     if (!settingsMenu) return;
@@ -3108,7 +3239,7 @@ populateSettingsMenu() {
     settingsMenu.innerHTML = menuHTML;
 }
 
-/* NEW: Bind settings menu events */
+/* Bind settings menu events */
 bindSettingsMenuEvents() {
     const settingsMenu = this.controls?.querySelector('.settings-menu');
     if (!settingsMenu) return;
@@ -5737,9 +5868,19 @@ initializeWatermark() {
         this.container.appendChild(watermark);
     }
 
+    // Store reference to watermark element
     // Store reference to watermark element
     this.watermarkElement = watermark;
 
+    // Set initial position
+    this.updateWatermarkPosition();
+
+    // Update position on window resize
+    this.watermarkResizeHandler = () => {
+        this.updateWatermarkPosition();
+    };
+    window.addEventListener('resize', this.watermarkResizeHandler);
+
     if (this.options.debug) {
         console.log('🏷️ Watermark created:', {
             url: this.options.watermarkUrl,
@@ -5758,6 +5899,7 @@ initializeWatermark() {
  * @param {string} position - Position of watermark (topleft, topright, bottomleft, bottomright)
  * @param {string} title - Optional tooltip title for the watermark
  */
+
 setWatermark(url, link = '', position = 'bottomright', title = '') {
     // Update options
     this.options.watermarkUrl = url;
@@ -5788,6 +5930,12 @@ removeWatermark() {
         this.watermarkElement = null;
     }
 
+    // Remove resize listener
+    if (this.watermarkResizeHandler) {
+        window.removeEventListener('resize', this.watermarkResizeHandler);
+        this.watermarkResizeHandler = null;
+    }
+
     this.options.watermarkUrl = '';
     this.options.watermarkLink = '';
     this.options.watermarkPosition = 'bottomright';
@@ -5802,6 +5950,7 @@ removeWatermark() {
  * Update watermark position
  * @param {string} position - New position (topleft, topright, bottomleft, bottomright)
  */
+
 setWatermarkPosition(position) {
     if (!['topleft', 'topright', 'bottomleft', 'bottomright'].includes(position)) {
         if (this.options.debug) console.warn('🏷️ Invalid watermark position:', position);
@@ -5828,6 +5977,39 @@ setWatermarkPosition(position) {
     return this;
 }
 
+/**
+ * Update watermark position based on current controlbar height
+ * Called during window resize to keep watermark above controlbar
+ */
+updateWatermarkPosition() {
+    if (!this.watermarkElement) return;
+    if (!this.controls) return;
+
+    const position = this.options.watermarkPosition || 'bottomright';
+
+    // Only update bottom positions (top positions don't need adjustment)
+    if (position === 'bottomleft' || position === 'bottomright') {
+        const controlsHeight = this.controls.offsetHeight;
+        const spacing = 15; // Same spacing used in CSS
+        const bottomValue = controlsHeight + spacing;
+
+        // Check if controls are visible
+        const hasControls = this.container.classList.contains('has-controls');
+
+        if (hasControls || !this.options.hideWatermark) {
+            // Position above controlbar
+            this.watermarkElement.style.bottom = `${bottomValue}px`;
+        } else {
+            // Position at bottom corner when controls hidden
+            this.watermarkElement.style.bottom = '15px';
+        }
+
+        if (this.options.debug) {
+            console.log(`🏷️ Watermark position updated: bottom ${this.watermarkElement.style.bottom}`);
+        }
+    }
+}
+
 /**
  * Set whether watermark should hide with controls
  * @param {boolean} hide - True to hide watermark with controls, false to keep always visible