@gcorevideo/player 2.22.14 → 2.22.16

package/lib/plugins/context-menu/ContextMenu.js

@@ -1,18 +1,18 @@
-import { Events, template, $, UIContainerPlugin, } from '@clappr/core';
+import { Events, template, $, UIContainerPlugin } from '@clappr/core';
 import { CLAPPR_VERSION } from '../../build.js';
 import '../../../assets/context-menu/context_menu.scss';
 import templateHtml from '../../../assets/context-menu/context_menu.ejs';
-import { version } from '../../version.js';
+const T = 'plugins.context_menu';
 /**
  * `PLUGIN` that displays a small context menu when clicked on the player container.
  * @beta
  * @remarks
  * Configuration options - {@link ContextMenuPluginSettings}
+ *
+ * Should not be used together with {@link ClickToPause} plugin
  */
 export class ContextMenu extends UIContainerPlugin {
-    _label = '';
-    _url = '';
-    menuOptions = [];
+    open = false;
     /**
      * @internal
      */
@@ -32,34 +32,16 @@ export class ContextMenu extends UIContainerPlugin {
         return { class: 'context-menu' };
     }
     static template = template(templateHtml);
-    get label() {
-        return this._label || 'Gcore player ver. ' + version().gplayer;
-    }
-    get url() {
-        return this._url || 'https://gcore.com/';
-    }
-    get exposeVersion() {
-        return {
-            label: this.label,
-            name: 'version',
-        };
-    }
     /**
      * @internal
      */
     get events() {
         return {
-            'click [data-version]': 'onOpenMainPage',
+            'click [role="menuitem"]': 'runAction',
         };
     }
     constructor(container) {
         super(container);
-        if (this.options.contextMenu && this.options.contextMenu.label) {
-            this._label = this.options.contextMenu.label;
-        }
-        if (this.options.contextMenu && this.options.contextMenu.url) {
-            this._url = this.options.contextMenu.url;
-        }
         this.render();
         $('body').on('click', this.hideOnBodyClick);
     }
@@ -67,8 +49,8 @@ export class ContextMenu extends UIContainerPlugin {
      * @internal
      */
     bindEvents() {
-        this.listenTo(this.container, Events.CONTAINER_CONTEXTMENU, this.toggleContextMenu);
-        this.listenTo(this.container, Events.CONTAINER_CLICK, this.hide);
+        this.listenTo(this.container, Events.CONTAINER_CONTEXTMENU, this.onContextMenu);
+        this.listenTo(this.container, Events.CONTAINER_CLICK, this.onContainerClick);
     }
     /**
      * @internal
@@ -77,34 +59,55 @@ export class ContextMenu extends UIContainerPlugin {
         $('body').off('click', this.hideOnBodyClick);
         return super.destroy();
     }
-    toggleContextMenu(event) {
+    onContainerClick() {
+        this.hide();
+    }
+    onContextMenu(event) {
+        if (!this.options.contextMenu?.options?.length) {
+            return;
+        }
         event.preventDefault();
+        event.stopPropagation();
         const offset = this.container?.$el.offset();
         this.show(event.pageY - offset.top, event.pageX - offset.left);
     }
     show(top, left) {
-        this.hide();
-        if (this.options.contextMenu &&
-            this.options.contextMenu.preventShowContextMenu) {
-            return;
-        }
+        this.open = true;
         this.$el.css({ top, left });
         this.$el.show();
     }
     hide() {
+        this.open = false;
         this.$el.hide();
     }
-    onOpenMainPage() {
-        window.open(this.url, '_blank');
+    runAction(event) {
+        event.preventDefault();
+        event.stopPropagation();
+        const itemName = event.currentTarget.dataset.name;
+        if (!itemName) {
+            return;
+        }
+        const item = this.options.contextMenu?.options.find((option) => option.name === itemName);
+        if (item?.handler) {
+            item.handler();
+        }
+        this.hide();
     }
     /**
      * @internal
      */
     render() {
-        this.menuOptions = [this.exposeVersion];
-        this.$el.html(ContextMenu.template({ options: this.menuOptions }));
+        if (!this.options.contextMenu?.options?.length) {
+            return this;
+        }
+        const options = this.options.contextMenu.options;
+        this.$el.html(ContextMenu.template({
+            options,
+            i18n: this.container.i18n,
+            iconic: options.some((option) => option.icon),
+        }));
         this.container.$el.append(this.$el); // TODO append to the container, turn into a container plugin
-        this.hide();
+        this.$el.hide();
         return this;
     }
     hideOnBodyClick = () => {

package/lib/plugins/media-control/MediaControl.d.ts

@@ -5,7 +5,7 @@ import '../../../assets/media-control/media-control.scss';
  * Media control elements that appear in the left area.
  * @beta
  */
-export type MediaControlLeftElement = 'clipText' | 'duration' | 'dvr' | 'playpause' | 'playstop' | 'position' | 'volume';
+export type MediaControlLeftElement = 'clipText' | 'duration' | 'dvr' | 'playpause' | 'playstop' | 'position' | 'volume' | 'clips';
 /**
  * Media control elements that appear in main layer, spanning the entire width of the player.
  * @beta
@@ -74,8 +74,6 @@ export declare class MediaControl extends UICorePlugin {
     private userDisabled;
     private userKeepVisible;
     private verticalVolume;
-    private $clipText;
-    private $clipTextContainer;
     private $duration;
     private $fullscreenToggle;
     private $multiCameraSelector;
@@ -241,15 +239,14 @@ export declare class MediaControl extends UICorePlugin {
      * ```ts
      * class MyPlugin extends UICorePlugin {
      *   override render() {
-     *     const mediaControl = this.core.getPlugin('media_control')
-     *     const clipText = mediaControl.getElement('clipText')
-     *     clipText?.el.text('Here we go')
+     *     this.$el.html('<div data-clips>Here we go</div>')
+     *     this.core.getPlugin('media_control').mount('clips', this.$el)
      *     return this
      *   }
      * }
      * ```
      */
-    getElement(name: MediaControlElement): ZeptoResult | null;
+    mount(name: MediaControlElement, element: ZeptoResult): void;
     putElement(name: MediaControlElement, element: ZeptoResult): void;
     /**
      * Toggle the visibility of a media control element

package/lib/plugins/media-control/MediaControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MediaControl.d.ts","sourceRoot":"","sources":["../../../src/plugins/media-control/MediaControl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MediaControl.d.ts","sourceRoot":"","sources":["../../../src/plugins/media-control/MediaControl.ts"],"names":[],"mappings":"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"}

package/lib/plugins/media-control/MediaControl.js

@@ -22,9 +22,7 @@ import fullscreenOffIcon from '../../../assets/icons/new/fullscreen-off.svg';
 import fullscreenOnIcon from '../../../assets/icons/new/fullscreen-on.svg';
 const DEFAULT_SETTINGS = {
     default: [],
-    left: [
-        'dvr'
-    ],
+    left: ['dvr'],
     right: [
         'audiotracks',
         'cc',
@@ -103,8 +101,6 @@ export class MediaControl extends UICorePlugin {
     userDisabled = false;
     userKeepVisible = false;
     verticalVolume = false;
-    $clipText = null;
-    $clipTextContainer = null;
     $duration = null;
     $fullscreenToggle = null;
     $multiCameraSelector = null;
@@ -296,7 +292,7 @@ export class MediaControl extends UICorePlugin {
         this.userDisabled = true; // TODO distinguish between user and system (e.g., unplayable) disabled?
         this.hide();
         this.unbindKeyEvents();
-        this.$el.hide();
+        this.$el.hide(); // TODO why?
     }
     /**
      * Reenables the plugin disabled earlier with the {@link MediaControl.disable} method
@@ -755,16 +751,16 @@ export class MediaControl extends UICorePlugin {
             right: [],
         }, this.core.activeContainer.settings);
         trace(`${T} updateSettings`, { newSettings });
+        newSettings.left.push('clips'); // TODO
         // TODO make order controlled via CSS
-        newSettings.left = orderByOrderPattern([...newSettings.left, 'clipsText', 'volume'], LEFT_ORDER);
+        newSettings.left = orderByOrderPattern([...newSettings.left, 'volume', 'clips'], LEFT_ORDER);
         if (this.core.activePlayback.getPlaybackType() === Playback.LIVE &&
             this.core.activePlayback.dvrEnabled) {
             newSettings.left.push('dvr');
         }
         // actual order of the items appear rendered is controlled by CSS
         newSettings.right = DEFAULT_SETTINGS.right; // TODO get from the options
-        if ((!this.fullScreenOnVideoTagSupported &&
-            !fullscreenEnabled()) ||
+        if ((!this.fullScreenOnVideoTagSupported && !fullscreenEnabled()) ||
             this.options.fullscreenDisable) {
             trace(`${T} updateSettings removing fullscreen`, {
                 supported: this.fullScreenOnVideoTagSupported,
@@ -811,8 +807,6 @@ export class MediaControl extends UICorePlugin {
         this.$volumeBarFill = this.$el.find('.bar-fill-1[data-volume]');
         this.$volumeBarScrubber = this.$el.find('.bar-scrubber[data-volume]');
         this.$multiCameraSelector = this.$el.find('.media-control-multicamera[data-multicamera]');
-        this.$clipText = this.$el.find('.media-clip-text[data-clipstext]'); // TODO
-        this.$clipTextContainer = this.$el.find('.media-clip-container[data-clipstext]');
         this.resetIndicators();
         this.initializeIcons();
     }
@@ -827,25 +821,14 @@ export class MediaControl extends UICorePlugin {
      * ```ts
      * class MyPlugin extends UICorePlugin {
      *   override render() {
-     *     const mediaControl = this.core.getPlugin('media_control')
-     *     const clipText = mediaControl.getElement('clipText')
-     *     clipText?.el.text('Here we go')
+     *     this.$el.html('<div data-clips>Here we go</div>')
+     *     this.core.getPlugin('media_control').mount('clips', this.$el)
      *     return this
      *   }
      * }
      * ```
      */
-    getElement(name) {
-        switch (name) {
-            case 'audiotracks':
-                return null;
-            case 'clipText':
-                return this.$clipText;
-            case 'seekBarContainer':
-                return this.$seekBarContainer;
-        }
-    }
-    putElement(name, element) {
+    mount(name, element) {
         const panel = this.getElementLocation(name);
         trace(`${T} putElement`, { name, panel: !!panel });
         if (panel) {
@@ -864,6 +847,9 @@ export class MediaControl extends UICorePlugin {
             return;
         }
     }
+    putElement(name, element) {
+        this.mount(name, element);
+    }
     /**
      * Toggle the visibility of a media control element
      * @param name - The name of the media control element
@@ -913,11 +899,11 @@ export class MediaControl extends UICorePlugin {
         if (!this.settings.seekEnabled) {
             return;
         }
-        const currentTime = this.container.getCurrentTime();
-        const duration = this.container.getDuration();
+        const currentTime = this.core.activeContainer.getCurrentTime();
+        const duration = this.core.activeContainer.getDuration();
         let position = Math.min(Math.max(currentTime + delta, 0), duration);
         position = Math.min((position * 100) / duration, 100);
-        this.container.seekPercentage(position);
+        this.core.activeContainer.seekPercentage(position);
     }
     bindKeyAndShow(key, callback) {
         // TODO or boolean return type
@@ -1035,7 +1021,10 @@ export class MediaControl extends UICorePlugin {
      * @internal
      */
     render() {
-        trace(`${T} render`, { needsUpdate: this.hasUpdate, metadataLoaded: this.metadataLoaded });
+        trace(`${T} render`, {
+            needsUpdate: this.hasUpdate,
+            metadataLoaded: this.metadataLoaded,
+        });
         if (!this.hasUpdate || !this.metadataLoaded) {
             return this;
         }
@@ -1191,8 +1180,7 @@ MediaControl.extend = function (properties) {
     return extend(MediaControl, properties);
 };
 function serializeSettings(s) {
-    return s.left
-        .slice()
+    return s.left.slice()
         .sort()
         .concat(s.right.slice().sort())
         .concat(s.default.slice().sort())

package/lib/plugins/utils.d.ts

@@ -1,4 +1,12 @@
 export declare function getLocation(href: string): HTMLAnchorElement;
-export declare function strtimeToMiliseconds(str: string): number;
+/**
+ * Parse a time string in the format "hh:mm:ss" or "mm:ss" or "ss" to seconds.
+ * @param str - The time string to parse.
+ * @returns The time in seconds.
+ * @example "01:01:00" -> 3660
+ * @example "01:00" -> 60
+ * @example "33" -> 33
+ */
+export declare function parseClipTime(str: string): number;
 export declare function getPageX(event: MouseEvent | TouchEvent): number;
 //# sourceMappingURL=utils.d.ts.map

package/lib/plugins/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/plugins/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,qBAMvC;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAyBxD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,GAAG,MAAM,CAU/D"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/plugins/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,qBAMvC;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAmBjD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,GAAG,MAAM,CAU/D"}

package/lib/plugins/utils.js

@@ -3,7 +3,15 @@ export function getLocation(href) {
     l.href = href;
     return l;
 }
-export function strtimeToMiliseconds(str) {
+/**
+ * Parse a time string in the format "hh:mm:ss" or "mm:ss" or "ss" to seconds.
+ * @param str - The time string to parse.
+ * @returns The time in seconds.
+ * @example "01:01:00" -> 3660
+ * @example "01:00" -> 60
+ * @example "33" -> 33
+ */
+export function parseClipTime(str) {
     if (!str) {
         return 0;
     }
@@ -12,21 +20,12 @@ export function strtimeToMiliseconds(str) {
     if (arr.length >= 3) {
         h = parseInt(arr[arr.length - 3]) * 60 * 60;
     }
-    else {
-        h = 0;
-    }
     if (arr.length >= 2) {
         m = parseInt(arr[arr.length - 2]) * 60;
     }
-    else {
-        m = 0;
-    }
     if (arr.length >= 1) {
         s = parseInt(arr[arr.length - 1]);
     }
-    else {
-        s = 0;
-    }
     return (h + m + s);
 }
 export function getPageX(event) {

package/lib/plugins/vast-ads/loaderxml.js

@@ -2,7 +2,7 @@ import { reportError } from '@gcorevideo/utils';
 import assert from 'assert';
 import URLHandler from './urlhandler.js';
 import MergeVast from './xmlmerge.js';
-import { strtimeToMiliseconds } from '../utils.js';
+import { parseClipTime } from '../utils.js';
 export default class LoaderXML {
     url;
     config = '';
@@ -91,7 +91,7 @@ export default class LoaderXML {
             this.removeTag('Tracking', 'event="progress"');
         }
         if (linearSkipOffset && linearSkipOffset.length > 1) {
-            timeOffset = strtimeToMiliseconds(linearSkipOffset[1]);
+            timeOffset = parseClipTime(linearSkipOffset[1]);
             this.config = this.config.replace(/<Linear skipoffset="(\d+:\d+:\d+)".*?>/g, '<Linear>');
         }
         return { skipEvents, progressEvents, timeOffset };

package/lib/testUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../src/testUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,YAAY,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,MAAM;IAErC,SAAS,CAAC,OAAO,EAAE,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,GAAG;IAClB,SAAS,CAAC,WAAW,CAAC,EAAE,GAAG;gBAFjB,OAAO,EAAE,GAAG,EACb,IAAI,EAAE,GAAG,EACR,WAAW,CAAC,EAAE,GAAG,YAAA;IAK7B,IAAI,IAAI,WAEP;IAED,OAAO;IAEP,IAAI;IAEJ,KAAK;IAEL,IAAI;IAEJ,OAAO;IAEP,IAAI;IAEJ,cAAc;IAEd,WAAW;IAIX,QAAQ;IAER,OAAO;IAEP,eAAe;IAIf,kBAAkB;IAIlB,cAAc;IAId,qBAAqB;IAIrB,IAAI;IAEJ,MAAM;IAEN,MAAM;IAEN,SAAS;IAET,eAAe;IAIf,WAAW;IAIX,QAAQ;IAIR,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;CAGtC;AAED,wBAAgB,cAAc,CAC5B,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACrC,SAAS,GAAE,GAA2B;;;;;;;;;;;;;;;;EAqBvC;AAED,wBAAgB,gBAAgB;;;EAK/B;AAED,wBAAgB,mBAAmB;;;;;;EAKlC;AAED,wBAAgB,kBAAkB,CAAC,IAAI,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkC/C;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,GAAE,GAA0B;;;;;;;;;;;;;;EAkBvE;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,gBAiB/C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,OAY7C"}
+{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../src/testUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,YAAY,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,MAAM;IAErC,SAAS,CAAC,OAAO,EAAE,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,GAAG;IAClB,SAAS,CAAC,WAAW,CAAC,EAAE,GAAG;gBAFjB,OAAO,EAAE,GAAG,EACb,IAAI,EAAE,GAAG,EACR,WAAW,CAAC,EAAE,GAAG,YAAA;IAK7B,IAAI,IAAI,WAEP;IAED,OAAO;IAEP,IAAI;IAEJ,KAAK;IAEL,IAAI;IAEJ,OAAO;IAEP,IAAI;IAEJ,cAAc;IAEd,WAAW;IAIX,QAAQ;IAER,OAAO;IAEP,eAAe;IAIf,kBAAkB;IAIlB,cAAc;IAId,qBAAqB;IAIrB,IAAI;IAEJ,MAAM;IAEN,MAAM;IAEN,SAAS;IAET,eAAe;IAIf,WAAW;IAIX,QAAQ;IAIR,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;CAGtC;AAED,wBAAgB,cAAc,CAC5B,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACrC,SAAS,GAAE,GAA2B;;;;;;;;;;;;;;;;EAqBvC;AAED,wBAAgB,gBAAgB;;;EAK/B;AAED,wBAAgB,mBAAmB;;;;;;EAKlC;AAED,wBAAgB,kBAAkB,CAAC,IAAI,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkC/C;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,GAAE,GAA0B;;;;;;;;;;;;;;EAkBvE;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,gBAc/C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,OAY7C"}

package/lib/testUtils.js

@@ -152,14 +152,11 @@ export function createMockMediaControl(core) {
     mediaControl.$el.html(`<div class="media-control-left-panel" data-media-control></div>
     <div class="media-control-right-panel" data-media-control></div>
     <div class="media-control-center-panel" data-media-control></div>`);
-    const elements = {
-        gear: $(document.createElement('div')),
-    };
-    // @ts-ignore
-    mediaControl.getElement = vi.fn().mockImplementation((name) => elements[name]);
     // @ts-ignore
     mediaControl.putElement = vi.fn();
     // @ts-ignore
+    mediaControl.mount = vi.fn();
+    // @ts-ignore
     mediaControl.toggleElement = vi.fn();
     return mediaControl;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcorevideo/player",
-  "version": "2.22.14",
+  "version": "2.22.16",
   "description": "Gcore JavaScript video player",
   "main": "dist/index.js",
   "type": "module",

package/src/Player.ts

@@ -159,6 +159,9 @@ export class Player {
    * ```
    */
   attachTo(playerElement: HTMLElement): void {
+    trace(`${T} attachTo`, {
+      player: !!this.player,
+    })
     assert.ok(!this.player, 'Player already initialized')
     assert.ok(playerElement, 'Player container element is required')
     if (this.config.debug === 'all' || this.config.debug === 'clappr') {
@@ -398,11 +401,9 @@ export class Player {
     trace(`${T} initPlayer`, {
       autoPlay: coreOptions.autoPlay,
       sources: coreOptions.sources,
+      player: !!this.player,
       // TODO selected options
     })
-
-    assert.ok(!this.player, 'Player already initialized')
-
     const player = new PlayerClappr(coreOptions)
     this.player = player
     this.bindCoreListeners()

package/src/playback/hls-playback/HlsPlayback.ts

@@ -586,17 +586,6 @@ export default class HlsPlayback extends BasePlayback {
   }
 
   seek(time: number) {
-    // trace(`${T} seek`, {
-    //   time,
-    //   duration: this._duration,
-    //   startTime: this._startTime,
-    //   currentTimestamp: this.currentTimestamp,
-    //   playbackType: this.getPlaybackType(),
-    //   dvrEnabled: this.dvrEnabled,
-    //   durationExcludesAfterLiveSyncPoint: this._durationExcludesAfterLiveSyncPoint,
-    //   minDvrSize: this._minDvrSize,
-      
-    //  })
     if (time < 0) {
       Log.warn(
         'Attempt to seek to a negative time. Resetting to live point. Use seekToLivePoint() to seek to the live point.',
@@ -768,11 +757,6 @@ export default class HlsPlayback extends BasePlayback {
       return
     }
     this._lastTimeUpdate = update
-    // trace(`${T} _onTimeUpdate`, {
-    //   current: update.current,
-    //   total: update.total,
-    //   firstFragDateTime: update.firstFragDateTime,
-    // })
     this.trigger(Events.PLAYBACK_TIMEUPDATE, update, this.name)
   }
 
@@ -1097,12 +1081,6 @@ export default class HlsPlayback extends BasePlayback {
   }
 
   get dvrEnabled() {
-    // trace(`${T} dvrEnabled`, {
-    //   durationExcludesAfterLiveSyncPoint: this._durationExcludesAfterLiveSyncPoint,
-    //   duration: this._duration,
-    //   minDvrSize: this._minDvrSize,
-    //   playbackType: this.getPlaybackType(),
-    // })
     // enabled when:
     // - the duration does not include content after hlsjs's live sync point
     // - the playable region duration is longer than the configured duration to enable dvr after

package/src/plugins/click-to-pause/ClickToPause.ts

@@ -10,7 +10,7 @@ import { CLAPPR_VERSION } from '../../build.js'
 
 type Timer = ReturnType<typeof setTimeout>
 
-const T = 'plugins.click_to_pause_custom'
+const T = 'plugins.click_to_pause'
 
 /**
  * A small `PLUGIN` that toggles the playback state on click over the video container