vidply 1.0.4 → 1.0.6

package/src/controls/CaptionManager.js

@@ -1,248 +1,248 @@
-/**
- * Caption/Subtitle Manager
- */
-
-import {DOMUtils} from '../utils/DOMUtils.js';
-import {i18n} from '../i18n/i18n.js';
-
-export class CaptionManager {
-    constructor(player) {
-        this.player = player;
-        this.element = null;
-        this.tracks = [];
-        this.currentTrack = null;
-        this.currentCue = null;
-
-        this.init();
-    }
-
-    init() {
-        this.createElement();
-        this.loadTracks();
-        this.attachEvents();
-
-        if (this.player.options.captionsDefault && this.tracks.length > 0) {
-            this.enable();
-        }
-    }
-
-    createElement() {
-        this.element = DOMUtils.createElement('div', {
-            className: `${this.player.options.classPrefix}-captions`,
-            attributes: {
-                'aria-live': 'polite',
-                'aria-atomic': 'true',
-                'role': 'region',
-                'aria-label': i18n.t('player.captions')
-            }
-        });
-
-        // Apply caption styles
-        this.updateStyles();
-
-        // Append to videoWrapper if it exists, otherwise to container
-        const target = this.player.videoWrapper || this.player.container;
-        target.appendChild(this.element);
-    }
-
-    loadTracks() {
-        const textTracks = this.player.element.textTracks;
-
-        for (let i = 0; i < textTracks.length; i++) {
-            const track = textTracks[i];
-
-            if (track.kind === 'subtitles' || track.kind === 'captions') {
-                this.tracks.push({
-                    track: track,
-                    language: track.language,
-                    label: track.label,
-                    kind: track.kind,
-                    index: i
-                });
-
-                // Disable all tracks initially
-                track.mode = 'hidden';
-            }
-        }
-    }
-
-    attachEvents() {
-        this.player.on('timeupdate', () => {
-            this.updateCaptions();
-        });
-
-        this.player.on('captionschange', () => {
-            this.updateStyles();
-        });
-    }
-
-    enable(trackIndex = 0) {
-        if (this.tracks.length === 0) {
-            return;
-        }
-
-        // Disable current track
-        if (this.currentTrack) {
-            this.currentTrack.track.mode = 'hidden';
-        }
-
-        // Enable selected track
-        const selectedTrack = this.tracks[trackIndex];
-
-        if (selectedTrack) {
-            // Set to 'hidden' not 'showing' to prevent browser from displaying native captions
-            // We'll handle the display ourselves
-            selectedTrack.track.mode = 'hidden';
-            this.currentTrack = selectedTrack;
-            this.player.state.captionsEnabled = true;
-
-            // Remove any existing cuechange listener
-            if (this.cueChangeHandler) {
-                selectedTrack.track.removeEventListener('cuechange', this.cueChangeHandler);
-            }
-
-            // Add event listener for cue changes
-            this.cueChangeHandler = () => {
-                this.updateCaptions();
-            };
-            selectedTrack.track.addEventListener('cuechange', this.cueChangeHandler);
-
-            this.player.emit('captionsenabled', selectedTrack);
-        }
-    }
-
-    disable() {
-        if (this.currentTrack) {
-            this.currentTrack.track.mode = 'hidden';
-            this.currentTrack = null;
-        }
-
-        this.element.style.display = 'none';
-        this.element.innerHTML = '';
-        this.currentCue = null;
-        this.player.state.captionsEnabled = false;
-        this.player.emit('captionsdisabled');
-    }
-
-    updateCaptions() {
-        if (!this.currentTrack) {
-            return;
-        }
-
-        if (!this.currentTrack.track.activeCues) {
-            return;
-        }
-
-        const activeCues = this.currentTrack.track.activeCues;
-
-        if (activeCues.length > 0) {
-            const cue = activeCues[0];
-
-            // Only update if the cue has changed
-            if (this.currentCue !== cue) {
-                this.currentCue = cue;
-
-                // Parse and display cue text
-                let text = cue.text;
-
-                // Handle VTT formatting
-                text = this.parseVTTFormatting(text);
-
-                this.element.innerHTML = DOMUtils.sanitizeHTML(text);
-
-                // Make sure it's visible when there's content
-                this.element.style.display = 'block';
-
-                this.player.emit('captionchange', cue);
-            }
-        } else if (this.currentCue) {
-            // Clear caption
-            this.element.innerHTML = '';
-            this.element.style.display = 'none';
-            this.currentCue = null;
-        }
-    }
-
-    parseVTTFormatting(text) {
-        // Basic VTT tag support
-        text = text.replace(/<c[^>]*>(.*?)<\/c>/g, '<span class="caption-class">$1</span>');
-        text = text.replace(/<b>(.*?)<\/b>/g, '<strong>$1</strong>');
-        text = text.replace(/<i>(.*?)<\/i>/g, '<em>$1</em>');
-        text = text.replace(/<u>(.*?)<\/u>/g, '<u>$1</u>');
-
-        // Voice tags
-        text = text.replace(/<v\s+([^>]+)>(.*?)<\/v>/g, '<span class="caption-voice" data-voice="$1">$2</span>');
-
-        return text;
-    }
-
-    updateStyles() {
-        if (!this.element) return;
-
-        const options = this.player.options;
-
-        this.element.style.fontSize = options.captionsFontSize;
-        this.element.style.fontFamily = options.captionsFontFamily;
-        this.element.style.color = options.captionsColor;
-        this.element.style.backgroundColor = this.hexToRgba(
-            options.captionsBackgroundColor,
-            options.captionsOpacity
-        );
-    }
-
-    hexToRgba(hex, alpha) {
-        const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-        if (result) {
-            return `rgba(${parseInt(result[1], 16)}, ${parseInt(result[2], 16)}, ${parseInt(result[3], 16)}, ${alpha})`;
-        }
-        return hex;
-    }
-
-    setCaptionStyle(property, value) {
-        switch (property) {
-            case 'fontSize':
-                this.player.options.captionsFontSize = value;
-                break;
-            case 'fontFamily':
-                this.player.options.captionsFontFamily = value;
-                break;
-            case 'color':
-                this.player.options.captionsColor = value;
-                break;
-            case 'backgroundColor':
-                this.player.options.captionsBackgroundColor = value;
-                break;
-            case 'opacity':
-                this.player.options.captionsOpacity = value;
-                break;
-        }
-
-        this.updateStyles();
-        this.player.emit('captionschange');
-    }
-
-    getAvailableTracks() {
-        return this.tracks.map((t, index) => ({
-            index,
-            language: t.language,
-            label: t.label || t.language,
-            kind: t.kind
-        }));
-    }
-
-    switchTrack(trackIndex) {
-        if (trackIndex >= 0 && trackIndex < this.tracks.length) {
-            this.disable();
-            this.enable(trackIndex);
-        }
-    }
-
-    destroy() {
-        this.disable();
-
-        if (this.element && this.element.parentNode) {
-            this.element.parentNode.removeChild(this.element);
-        }
-    }
-}
-
+/**
+ * Caption/Subtitle Manager
+ */
+
+import {DOMUtils} from '../utils/DOMUtils.js';
+import {i18n} from '../i18n/i18n.js';
+
+export class CaptionManager {
+    constructor(player) {
+        this.player = player;
+        this.element = null;
+        this.tracks = [];
+        this.currentTrack = null;
+        this.currentCue = null;
+
+        this.init();
+    }
+
+    init() {
+        this.createElement();
+        this.loadTracks();
+        this.attachEvents();
+
+        if (this.player.options.captionsDefault && this.tracks.length > 0) {
+            this.enable();
+        }
+    }
+
+    createElement() {
+        this.element = DOMUtils.createElement('div', {
+            className: `${this.player.options.classPrefix}-captions`,
+            attributes: {
+                'aria-live': 'polite',
+                'aria-atomic': 'true',
+                'role': 'region',
+                'aria-label': i18n.t('player.captions')
+            }
+        });
+
+        // Apply caption styles
+        this.updateStyles();
+
+        // Append to videoWrapper if it exists, otherwise to container
+        const target = this.player.videoWrapper || this.player.container;
+        target.appendChild(this.element);
+    }
+
+    loadTracks() {
+        const textTracks = this.player.element.textTracks;
+
+        for (let i = 0; i < textTracks.length; i++) {
+            const track = textTracks[i];
+
+            if (track.kind === 'subtitles' || track.kind === 'captions') {
+                this.tracks.push({
+                    track: track,
+                    language: track.language,
+                    label: track.label,
+                    kind: track.kind,
+                    index: i
+                });
+
+                // Disable all tracks initially
+                track.mode = 'hidden';
+            }
+        }
+    }
+
+    attachEvents() {
+        this.player.on('timeupdate', () => {
+            this.updateCaptions();
+        });
+
+        this.player.on('captionschange', () => {
+            this.updateStyles();
+        });
+    }
+
+    enable(trackIndex = 0) {
+        if (this.tracks.length === 0) {
+            return;
+        }
+
+        // Disable current track
+        if (this.currentTrack) {
+            this.currentTrack.track.mode = 'hidden';
+        }
+
+        // Enable selected track
+        const selectedTrack = this.tracks[trackIndex];
+
+        if (selectedTrack) {
+            // Set to 'hidden' not 'showing' to prevent browser from displaying native captions
+            // We'll handle the display ourselves
+            selectedTrack.track.mode = 'hidden';
+            this.currentTrack = selectedTrack;
+            this.player.state.captionsEnabled = true;
+
+            // Remove any existing cuechange listener
+            if (this.cueChangeHandler) {
+                selectedTrack.track.removeEventListener('cuechange', this.cueChangeHandler);
+            }
+
+            // Add event listener for cue changes
+            this.cueChangeHandler = () => {
+                this.updateCaptions();
+            };
+            selectedTrack.track.addEventListener('cuechange', this.cueChangeHandler);
+
+            this.player.emit('captionsenabled', selectedTrack);
+        }
+    }
+
+    disable() {
+        if (this.currentTrack) {
+            this.currentTrack.track.mode = 'hidden';
+            this.currentTrack = null;
+        }
+
+        this.element.style.display = 'none';
+        this.element.innerHTML = '';
+        this.currentCue = null;
+        this.player.state.captionsEnabled = false;
+        this.player.emit('captionsdisabled');
+    }
+
+    updateCaptions() {
+        if (!this.currentTrack) {
+            return;
+        }
+
+        if (!this.currentTrack.track.activeCues) {
+            return;
+        }
+
+        const activeCues = this.currentTrack.track.activeCues;
+
+        if (activeCues.length > 0) {
+            const cue = activeCues[0];
+
+            // Only update if the cue has changed
+            if (this.currentCue !== cue) {
+                this.currentCue = cue;
+
+                // Parse and display cue text
+                let text = cue.text;
+
+                // Handle VTT formatting
+                text = this.parseVTTFormatting(text);
+
+                this.element.innerHTML = DOMUtils.sanitizeHTML(text);
+
+                // Make sure it's visible when there's content
+                this.element.style.display = 'block';
+
+                this.player.emit('captionchange', cue);
+            }
+        } else if (this.currentCue) {
+            // Clear caption
+            this.element.innerHTML = '';
+            this.element.style.display = 'none';
+            this.currentCue = null;
+        }
+    }
+
+    parseVTTFormatting(text) {
+        // Basic VTT tag support
+        text = text.replace(/<c[^>]*>(.*?)<\/c>/g, '<span class="caption-class">$1</span>');
+        text = text.replace(/<b>(.*?)<\/b>/g, '<strong>$1</strong>');
+        text = text.replace(/<i>(.*?)<\/i>/g, '<em>$1</em>');
+        text = text.replace(/<u>(.*?)<\/u>/g, '<u>$1</u>');
+
+        // Voice tags
+        text = text.replace(/<v\s+([^>]+)>(.*?)<\/v>/g, '<span class="caption-voice" data-voice="$1">$2</span>');
+
+        return text;
+    }
+
+    updateStyles() {
+        if (!this.element) return;
+
+        const options = this.player.options;
+
+        this.element.style.fontSize = options.captionsFontSize;
+        this.element.style.fontFamily = options.captionsFontFamily;
+        this.element.style.color = options.captionsColor;
+        this.element.style.backgroundColor = this.hexToRgba(
+            options.captionsBackgroundColor,
+            options.captionsOpacity
+        );
+    }
+
+    hexToRgba(hex, alpha) {
+        const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+        if (result) {
+            return `rgba(${parseInt(result[1], 16)}, ${parseInt(result[2], 16)}, ${parseInt(result[3], 16)}, ${alpha})`;
+        }
+        return hex;
+    }
+
+    setCaptionStyle(property, value) {
+        switch (property) {
+            case 'fontSize':
+                this.player.options.captionsFontSize = value;
+                break;
+            case 'fontFamily':
+                this.player.options.captionsFontFamily = value;
+                break;
+            case 'color':
+                this.player.options.captionsColor = value;
+                break;
+            case 'backgroundColor':
+                this.player.options.captionsBackgroundColor = value;
+                break;
+            case 'opacity':
+                this.player.options.captionsOpacity = value;
+                break;
+        }
+
+        this.updateStyles();
+        this.player.emit('captionschange');
+    }
+
+    getAvailableTracks() {
+        return this.tracks.map((t, index) => ({
+            index,
+            language: t.language,
+            label: t.label || t.language,
+            kind: t.kind
+        }));
+    }
+
+    switchTrack(trackIndex) {
+        if (trackIndex >= 0 && trackIndex < this.tracks.length) {
+            this.disable();
+            this.enable(trackIndex);
+        }
+    }
+
+    destroy() {
+        this.disable();
+
+        if (this.element && this.element.parentNode) {
+            this.element.parentNode.removeChild(this.element);
+        }
+    }
+}
+

package/src/controls/ControlBar.js

@@ -701,7 +701,7 @@ export class ControlBar {
             className: `${this.player.options.classPrefix}-time`,
             attributes: {
                 'role': 'group',
-                'aria-label': 'Time display'
+                'aria-label': i18n.t('time.display')
             }
         });
 
@@ -709,7 +709,7 @@ export class ControlBar {
         this.controls.currentTimeDisplay = DOMUtils.createElement('span', {
             className: `${this.player.options.classPrefix}-current-time`,
             attributes: {
-                'aria-label': '0 seconds'
+                'aria-label': i18n.t('time.seconds', { count: 0 })
             }
         });
         
@@ -734,7 +734,7 @@ export class ControlBar {
         this.controls.durationDisplay = DOMUtils.createElement('span', {
             className: `${this.player.options.classPrefix}-duration`,
             attributes: {
-                'aria-label': 'Duration: 0 seconds'
+                'aria-label': i18n.t('time.durationPrefix') + i18n.t('time.seconds', { count: 0 })
             }
         });
         
@@ -1835,7 +1835,7 @@ export class ControlBar {
             // Update visual text (hidden from screen readers)
             this.controls.durationVisual.textContent = TimeUtils.formatTime(duration);
             // Update aria-label with human-readable format
-            this.controls.durationDisplay.setAttribute('aria-label', 'Duration: ' + TimeUtils.formatDuration(duration));
+            this.controls.durationDisplay.setAttribute('aria-label', i18n.t('time.durationPrefix') + TimeUtils.formatDuration(duration));
         }
     }