@gcorevideo/player 2.22.13 → 2.22.15

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

@@ -65,8 +65,10 @@ export declare class MediaControl extends UICorePlugin {
     private kibo;
     private lastMouseX;
     private lastMouseY;
-    private needsUpdate;
+    private metadataLoaded;
+    private hasUpdate;
     private persistConfig;
+    private renderTimerId;
     private rendered;
     private settings;
     private userDisabled;
@@ -271,6 +273,7 @@ export declare class MediaControl extends UICorePlugin {
      * @internal
      */
     destroy(): import("@clappr/core").UIObject;
+    private cancelRenderTimer;
     private configure;
     /**
      * @internal

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":"AAOA,OAAO,EAEL,YAAY,EAMZ,IAAI,EACL,MAAM,cAAc,CAAA;AASrB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAI5C,OAAO,kDAAkD,CAAA;AAWzD;;;GAGG;AACH,MAAM,MAAM,uBAAuB,GAC/B,UAAU,GACV,UAAU,GACV,KAAK,GACL,WAAW,GACX,UAAU,GACV,UAAU,GACV,QAAQ,CAAA;AAIZ;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAChC,SAAS,GACT,kBAAkB,CAAA;AAEtB;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAChC,aAAa,GACb,IAAI,GACJ,YAAY,GACZ,cAAc,GACd,MAAM,GACN,aAAa,GACb,KAAK,GACL,IAAI,CAAA;AAER;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAC3B,uBAAuB,GACvB,wBAAwB,GACxB,wBAAwB,CAAA;AAE5B;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,uBAAuB,EAAE,CAAA;IAC/B,KAAK,EAAE,wBAAwB,EAAE,CAAA;IACjC,OAAO,EAAE,wBAAwB,EAAE,CAAA;IACnC,WAAW,EAAE,OAAO,CAAA;CACrB,CAAA;AA0DD;;;;;;;;;;;;;GAaG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAG5C,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,wBAAwB,CAAI;IAEpC,OAAO,CAAC,qBAAqB,CAA0B;IACvD,OAAO,CAAC,iBAAiB,CAAsB;IAC/C,OAAO,CAAC,iBAAiB,CAAsB;IAC/C,OAAO,CAAC,0BAA0B,CAAsB;IAExD,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,iBAAiB,CAAQ;IAEjC,OAAO,CAAC,6BAA6B,CAAQ;IAE7C,OAAO,CAAC,MAAM,CAA6C;IAC3D,OAAO,CAAC,YAAY,CAA6C;IAEjE,OAAO,CAAC,cAAc,CAAM;IAE5B,OAAO,CAAC,WAAW,CAAQ;IAE3B,OAAO,CAAC,IAAI,CAAM;IAElB,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,UAAU,CAAI;IAEtB,OAAO,CAAC,WAAW,CAAQ;IAE3B,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,QAAQ,CAAQ;IAExB,OAAO,CAAC,QAAQ,CAAyC;IAEzD,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,eAAe,CAAQ;IAE/B,OAAO,CAAC,cAAc,CAAQ;IAE9B,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,kBAAkB,CAA2B;IAErD,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,iBAAiB,CAA2B;IAEpD,OAAO,CAAC,oBAAoB,CAA2B;IAEvD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,eAAe,CAA2B;IAElD,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,iBAAiB,CAA2B;IAEpD,OAAO,CAAC,aAAa,CAA2B;IAEhD,OAAO,CAAC,cAAc,CAA2B;IAEjD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,mBAAmB,CAA2B;IAEtD,OAAO,CAAC,oBAAoB,CAA2B;IAEvD,OAAO,CAAC,cAAc,CAA2B;IAEjD,OAAO,CAAC,kBAAkB,CAA2B;IAErD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,WAAW,CAA2B;IAE9C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IAE7D;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED,OAAO,KAAK,QAAQ,GAMnB;IAED;;;OAGG;IACH,IAAI,SAAS,QAEZ;IAED;;;OAGG;IACH,IAAI,QAAQ,QAEX;IAED;;OAEG;IACH,IAAa,UAAU;;;MAKtB;IAED;;OAEG;IACH,IAAa,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;MA4BlB;IAED,IAAI,cAAc,WAEjB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAInB;IAED;;OAEG;IACH,IAAI,KAAK,YAER;gBAEW,IAAI,EAAE,IAAI;IAqBtB;;OAEG;IACM,oBAAoB;2BAoZZ,MAAM;;;IA7YvB;;OAEG;IACM,UAAU;IAuCnB,OAAO,CAAC,mBAAmB;IA2E3B;;OAEG;IACM,OAAO;IAQhB;;OAEG;IACM,MAAM;IAUf;;OAEG;IACH,gBAAgB;IAOhB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,gBAAgB;IAiBxB,OAAO,CAAC,cAAc;IAwDtB,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,YAAY;IA6BpB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,QAAQ,CAQf;IAED,OAAO,CAAC,UAAU,CAgBjB;IAED,OAAO,CAAC,oBAAoB;IAsB5B,OAAO,CAAC,UAAU;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,UAAQ;IA+BhD,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,wBAAwB;IAoChC,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,aAAa;IAyBrB,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,IAAI;IAkBZ,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,IAAI;IAgCZ,OAAO,CAAC,IAAI;IAmCZ,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,cAAc;IAgEtB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,oBAAoB;IAqC5B;;;;;;;;;;;;;;;;;;OAkBG;IACH,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,WAAW,GAAG,IAAI;IAWzD,UAAU,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,WAAW;IAmB1D;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,OAAO;IAItD,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,YAAY;IAapB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,aAAa;IA8CrB,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,WAAW;IAiCnB,OAAO,CAAC,gBAAgB;IAMxB;;OAEG;IACM,OAAO;IAShB,OAAO,CAAC,SAAS;IAIjB;;OAEG;IACM,MAAM;IAyEf,OAAO,CAAC,qBAAqB;IAiB7B,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAIvB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAcvB;;OAEG;IACH,mBAAmB;IAMnB;;OAEG;IACH,qBAAqB;IAOrB,OAAO,CAAC,6BAA6B;IAQrC,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,iBAAiB;CAO1B"}
+{"version":3,"file":"MediaControl.d.ts","sourceRoot":"","sources":["../../../src/plugins/media-control/MediaControl.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,YAAY,EAMZ,IAAI,EACL,MAAM,cAAc,CAAA;AASrB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAI5C,OAAO,kDAAkD,CAAA;AAWzD;;;GAGG;AACH,MAAM,MAAM,uBAAuB,GAC/B,UAAU,GACV,UAAU,GACV,KAAK,GACL,WAAW,GACX,UAAU,GACV,UAAU,GACV,QAAQ,CAAA;AAEZ;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAChC,SAAS,GACT,kBAAkB,CAAA;AAEtB;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAChC,aAAa,GACb,IAAI,GACJ,YAAY,GACZ,cAAc,GACd,MAAM,GACN,aAAa,GACb,KAAK,GACL,IAAI,CAAA;AAER;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAC3B,uBAAuB,GACvB,wBAAwB,GACxB,wBAAwB,CAAA;AAE5B;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,uBAAuB,EAAE,CAAA;IAC/B,KAAK,EAAE,wBAAwB,EAAE,CAAA;IACjC,OAAO,EAAE,wBAAwB,EAAE,CAAA;IACnC,WAAW,EAAE,OAAO,CAAA;CACrB,CAAA;AA0DD;;;;;;;;;;;;;GAaG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAG5C,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,wBAAwB,CAAI;IAEpC,OAAO,CAAC,qBAAqB,CAA0B;IACvD,OAAO,CAAC,iBAAiB,CAAsB;IAC/C,OAAO,CAAC,iBAAiB,CAAsB;IAC/C,OAAO,CAAC,0BAA0B,CAAsB;IAExD,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,iBAAiB,CAAQ;IAEjC,OAAO,CAAC,6BAA6B,CAAQ;IAE7C,OAAO,CAAC,MAAM,CAA6C;IAC3D,OAAO,CAAC,YAAY,CAA6C;IAEjE,OAAO,CAAC,cAAc,CAAM;IAE5B,OAAO,CAAC,WAAW,CAAQ;IAE3B,OAAO,CAAC,IAAI,CAAM;IAElB,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,UAAU,CAAI;IAEtB,OAAO,CAAC,cAAc,CAAQ;IAE9B,OAAO,CAAC,SAAS,CAAQ;IAEzB,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,aAAa,CAA6C;IAElE,OAAO,CAAC,QAAQ,CAAQ;IAExB,OAAO,CAAC,QAAQ,CAAyC;IAEzD,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,eAAe,CAAQ;IAE/B,OAAO,CAAC,cAAc,CAAQ;IAE9B,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,kBAAkB,CAA2B;IAErD,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,iBAAiB,CAA2B;IAEpD,OAAO,CAAC,oBAAoB,CAA2B;IAEvD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,eAAe,CAA2B;IAElD,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,iBAAiB,CAA2B;IAEpD,OAAO,CAAC,aAAa,CAA2B;IAEhD,OAAO,CAAC,cAAc,CAA2B;IAEjD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,mBAAmB,CAA2B;IAEtD,OAAO,CAAC,oBAAoB,CAA2B;IAEvD,OAAO,CAAC,cAAc,CAA2B;IAEjD,OAAO,CAAC,kBAAkB,CAA2B;IAErD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,WAAW,CAA2B;IAE9C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IAE7D;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED,OAAO,KAAK,QAAQ,GAMnB;IAED;;;OAGG;IACH,IAAI,SAAS,QAEZ;IAED;;;OAGG;IACH,IAAI,QAAQ,QAEX;IAED;;OAEG;IACH,IAAa,UAAU;;;MAKtB;IAED;;OAEG;IACH,IAAa,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;MA4BlB;IAED,IAAI,cAAc,WAEjB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAInB;IAED;;OAEG;IACH,IAAI,KAAK,YAER;gBAEW,IAAI,EAAE,IAAI;IAqBtB;;OAEG;IACM,oBAAoB;2BA8ZZ,MAAM;;;IAvZvB;;OAEG;IACM,UAAU;IAuCnB,OAAO,CAAC,mBAAmB;IAiF3B;;OAEG;IACM,OAAO;IAQhB;;OAEG;IACM,MAAM;IAUf;;OAEG;IACH,gBAAgB;IAOhB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,cAAc;IAwDtB,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,YAAY;IA6BpB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,QAAQ,CAQf;IAED,OAAO,CAAC,UAAU,CAgBjB;IAED,OAAO,CAAC,oBAAoB;IAsB5B,OAAO,CAAC,UAAU;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,UAAQ;IA+BhD,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,wBAAwB;IAqChC,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,aAAa;IAyBrB,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,IAAI;IAkBZ,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,IAAI;IAgCZ,OAAO,CAAC,IAAI;IAmCZ,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,cAAc;IAgEtB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,oBAAoB;IAqC5B;;;;;;;;;;;;;;;;;;OAkBG;IACH,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,WAAW,GAAG,IAAI;IAWzD,UAAU,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,WAAW;IAmB1D;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,OAAO;IAItD,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,YAAY;IAapB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,aAAa;IA8CrB,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,WAAW;IAiCnB,OAAO,CAAC,gBAAgB;IAMxB;;OAEG;IACM,OAAO;IAUhB,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,SAAS;IAIjB;;OAEG;IACM,MAAM;IAyEf,OAAO,CAAC,qBAAqB;IAiB7B,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAIvB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAcvB;;OAEG;IACH,mBAAmB;IAMnB;;OAEG;IACH,qBAAqB;IAOrB,OAAO,CAAC,6BAA6B;IAQrC,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,iBAAiB;CAO1B"}

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

@@ -94,8 +94,10 @@ export class MediaControl extends UICorePlugin {
     kibo;
     lastMouseX = 0;
     lastMouseY = 0;
-    needsUpdate = false;
+    metadataLoaded = false;
+    hasUpdate = false;
     persistConfig;
+    renderTimerId = null;
     rendered = false;
     settings = INITIAL_SETTINGS;
     userDisabled = false;
@@ -281,8 +283,10 @@ export class MediaControl extends UICorePlugin {
         this.listenTo(this.core.activeContainer, Events.CONTAINER_ENDED, this.ended);
         this.listenTo(this.core.activeContainer, Events.CONTAINER_VOLUME, this.onVolumeChanged);
         this.listenTo(this.core.activeContainer, Events.CONTAINER_OPTIONS_CHANGE, this.setInitialVolume);
-        // wait until the metadata has loaded and then check if fullscreen on video tag is supported
-        this.listenToOnce(this.core.activeContainer, Events.CONTAINER_LOADEDMETADATA, this.onLoadedMetadata);
+        this.listenTo(this.core.activeContainer, Events.CONTAINER_LOADEDMETADATA, this.onLoadedMetadata);
+        this.listenTo(this.core, Events.CONTAINER_DESTROYED, () => {
+            this.cancelRenderTimer();
+        });
     }
     /**
      * Hides the media control UI
@@ -325,13 +329,17 @@ export class MediaControl extends UICorePlugin {
             // TODO sort out, use single utility function
             this.fullScreenOnVideoTagSupported = true;
         }
-        this.updateSettings();
-        if (this.core.activeContainer.getPlaybackType() === Playback.LIVE) {
-            this.$el.addClass('live');
-        }
-        else {
-            this.$el.removeClass('live');
-        }
+        this.renderTimerId = setTimeout(() => {
+            this.renderTimerId = null;
+            this.metadataLoaded = true;
+            this.render();
+            if (this.core.activeContainer.getPlaybackType() === Playback.LIVE) {
+                this.$el.addClass('live');
+            }
+            else {
+                this.$el.removeClass('live');
+            }
+        }, 25);
     }
     updateVolumeUI() {
         // this will be called after a render
@@ -555,6 +563,7 @@ export class MediaControl extends UICorePlugin {
     }
     onActiveContainerChanged() {
         this.fullScreenOnVideoTagSupported = false;
+        this.metadataLoaded = false;
         // set the new container to match the volume of the last one
         this.setInitialVolume();
         this.changeTogglePlay();
@@ -776,7 +785,7 @@ export class MediaControl extends UICorePlugin {
         const settingsChanged = serializeSettings(this.settings) !== serializeSettings(newSettings);
         if (settingsChanged) {
             this.settings = newSettings;
-            this.needsUpdate = true;
+            this.hasUpdate = true;
             this.render();
         }
     }
@@ -1005,6 +1014,7 @@ export class MediaControl extends UICorePlugin {
      * @internal
      */
     destroy() {
+        this.cancelRenderTimer();
         $(document).unbind('mouseup', this.stopDrag);
         $(document).unbind('mousemove', this.updateDrag);
         $(document).unbind('touchend', this.stopDrag);
@@ -1012,6 +1022,12 @@ export class MediaControl extends UICorePlugin {
         this.unbindKeyEvents();
         return super.destroy();
     }
+    cancelRenderTimer() {
+        if (this.renderTimerId) {
+            clearTimeout(this.renderTimerId);
+            this.renderTimerId = null;
+        }
+    }
     configure() {
         this.trigger(Events.MEDIACONTROL_OPTIONS_CHANGE);
     }
@@ -1019,8 +1035,8 @@ export class MediaControl extends UICorePlugin {
      * @internal
      */
     render() {
-        trace(`${T} render`, { needsUpdate: this.needsUpdate });
-        if (!this.needsUpdate) {
+        trace(`${T} render`, { needsUpdate: this.hasUpdate, metadataLoaded: this.metadataLoaded });
+        if (!this.hasUpdate || !this.metadataLoaded) {
             return this;
         }
         const timeout = this.options.hideMediaControlDelay || 2000;
@@ -1070,7 +1086,7 @@ export class MediaControl extends UICorePlugin {
         this.core.$el.append(this.el);
         this.rendered = true;
         this.updateVolumeUI();
-        this.needsUpdate = false;
+        this.hasUpdate = false;
         // TODO setTimeout?
         this.trigger(Events.MEDIACONTROL_RENDERED);
         return this;

package/lib/plugins/playback-rate/PlaybackRate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PlaybackRate.d.ts","sourceRoot":"","sources":["../../../src/plugins/playback-rate/PlaybackRate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAsB,IAAI,EAAK,MAAM,cAAc,CAAA;AAkBhF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAA;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAgBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAI5C,OAAO,CAAC,YAAY,CAAwB;IAE5C,OAAO,CAAC,cAAc,CAAQ;IAI9B,OAAO,CAAC,YAAY,CAAuB;IAE3C;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAuB;IAE7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAqB;gBAE7C,IAAI,EAAE,IAAI;IAOtB,OAAO,KAAK,aAAa,GAExB;IAED;;OAEG;IACH,IAAa,UAAU;;MAItB;IAED;;OAEG;IACH,IAAa,MAAM;;;MAKlB;IAED;;OAEG;IACM,UAAU;IASnB,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,uBAAuB;IAuB/B,OAAO,CAAC,sBAAsB;IAK9B,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,KAAK;IAqCb,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,oBAAoB;IAe5B,OAAO,CAAC,WAAW;IAoBnB;;OAEG;IACM,MAAM;IAkBf;;OAEG;IACM,OAAO;IAwBhB,OAAO,CAAC,MAAM;IAWd,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,QAAQ;IAYhB,OAAO,CAAC,MAAM;IAMd,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,qBAAqB;CAM9B"}
+{"version":3,"file":"PlaybackRate.d.ts","sourceRoot":"","sources":["../../../src/plugins/playback-rate/PlaybackRate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAsB,IAAI,EAAK,MAAM,cAAc,CAAA;AAkBhF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAA;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAgBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAI5C,OAAO,CAAC,YAAY,CAAwB;IAE5C,OAAO,CAAC,cAAc,CAAQ;IAE9B,OAAO,CAAC,YAAY,CAAuB;IAE3C;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAuB;IAE7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAqB;gBAE7C,IAAI,EAAE,IAAI;IAOtB,OAAO,KAAK,aAAa,GAExB;IAED;;OAEG;IACH,IAAa,UAAU;;MAItB;IAED;;OAEG;IACH,IAAa,MAAM;;;MAKlB;IAED;;OAEG;IACM,UAAU;IASnB,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,uBAAuB;IAiB/B,OAAO,CAAC,sBAAsB;IAK9B,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,KAAK;IAsBb,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,oBAAoB;IAe5B,OAAO,CAAC,WAAW;IAoBnB;;OAEG;IACM,MAAM;IAkBf;;OAEG;IACM,OAAO;IAwBhB,OAAO,CAAC,MAAM;IAWd,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,QAAQ;IAYhB,OAAO,CAAC,MAAM;IAMd,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,qBAAqB;CAM9B"}

package/lib/plugins/playback-rate/PlaybackRate.js

@@ -57,7 +57,6 @@ export class PlaybackRate extends UICorePlugin {
     // private prevSelectedRate: string | undefined
     selectedRate = DEFAULT_PLAYBACK_RATE;
     metadataLoaded = false;
-    // private playbackSettingsUpdateReceived = false
     mountTimerId = null;
     /**
      * @internal
@@ -118,14 +117,8 @@ export class PlaybackRate extends UICorePlugin {
     onActiveContainerChange() {
         trace(`${T} onActiveContainerChange`);
         this.metadataLoaded = false;
-        // this.playbackSettingsUpdateReceived = false
         this.listenTo(this.core.activePlayback, Events.PLAYBACK_STOP, this.onStop);
         this.listenTo(this.core.activePlayback, Events.PLAYBACK_PLAY, this.onPlay);
-        // this.listenTo(
-        //   this.core.activePlayback,
-        //   Events.PLAYBACK_SETTINGSUPDATE,
-        //   this.onSettingsUpdate,
-        // )
         this.listenTo(this.core.activePlayback, PlaybackEvents.PLAYBACK_RATE_CHANGED, this.onPlaybackRateChange);
         this.listenTo(this.core.activeContainer, Events.CONTAINER_LOADEDMETADATA, this.onMetaDataLoaded);
     }
@@ -154,27 +147,13 @@ export class PlaybackRate extends UICorePlugin {
             i18n: this.core.i18n,
         })));
     }
-    // private onSettingsUpdate() {
-    //   trace(`${T} onSettingsUpdate`, {
-    //     playbackType: this.core.activePlayback.getPlaybackType(),
-    //     dvrEnabled: this.core.activePlayback.dvrEnabled,
-    //   })
-    //   this.playbackSettingsUpdateReceived = true
-    //   if (this.metadataLoaded) {
-    //     if (this.mountTimerId) {
-    //       clearTimeout(this.mountTimerId)
-    //       this.mountTimerId = null
-    //     }
-    //     this.mount()
-    //   }
-    // }
     onMetaDataLoaded() {
         trace(`${T} onMetaDataLoaded`, {
             playbackType: this.core.activePlayback.getPlaybackType(),
             dvrEnabled: this.core.activePlayback.dvrEnabled,
         });
-        this.metadataLoaded = true;
         this.mountTimerId = setTimeout(() => {
+            this.metadataLoaded = true;
             this.mountTimerId = null;
             this.mount();
         }, 25);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcorevideo/player",
-  "version": "2.22.13",
+  "version": "2.22.15",
   "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/plugins/clappr-nerd-stats/ClapprNerdStats.ts

@@ -25,7 +25,6 @@ import pluginHtml from '../../../assets/clappr-nerd-stats/clappr-nerd-stats.ejs'
 import buttonHtml from '../../../assets/clappr-nerd-stats/button.ejs'
 import statsIcon from '../../../assets/icons/new/stats.svg'
 import { BottomGear, GearEvents } from '../bottom-gear/BottomGear.js'
-import { MediaControl } from '../media-control/MediaControl.js'
 import assert from 'assert'
 
 const qualityClasses = [

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

package/src/plugins/context-menu/ContextMenu.ts

@@ -1,20 +1,34 @@
-import {
-  Events,
-  template,
-  $,
-  Container,
-  UIContainerPlugin,
-} from '@clappr/core'
+import { Events, template, $, Container, 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'
 
-type MenuOption = {
-  label: string
+/**
+ * @beta
+ */
+export type MenuOption = {
+  /**
+   * Menu item label text. One of `label` or `labelKey` must be specified.
+   */
+  label?: string
+  /**
+   * Menu item label localisation key, if specified, the `label` will be ignored
+   */
+  labelKey?: string
+  /**
+   * Menu item name. Must be unique.
+   */
   name: string
+  /**
+   * Menu item handler function
+   */
+  handler?: () => void
+  /**
+   * Menu item icon, plain HTML string
+   */
+  icon?: string
 }
 
 /**
@@ -22,23 +36,21 @@ type MenuOption = {
  * @beta
  */
 export interface ContextMenuPluginSettings {
-  label?: string
-  url?: string
-  preventShowContextMenu?: boolean
+  options?: MenuOption[]
 }
 
+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 {
-  private _label: string = ''
-
-  private _url: string = ''
-
-  private menuOptions: MenuOption[] = []
+  private open = false
 
   /**
    * @internal
@@ -63,38 +75,17 @@ export class ContextMenu extends UIContainerPlugin {
 
   private static readonly template = template(templateHtml)
 
-  private get label() {
-    return this._label || 'Gcore player ver. ' + version().gplayer
-  }
-
-  private get url() {
-    return this._url || 'https://gcore.com/'
-  }
-
-  private get exposeVersion() {
-    return {
-      label: this.label,
-      name: 'version',
-    }
-  }
-
   /**
    * @internal
    */
   override get events() {
     return {
-      'click [data-version]': 'onOpenMainPage',
+      'click [role="menuitem"]': 'runAction',
     }
   }
 
   constructor(container: 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)
   }
@@ -106,9 +97,9 @@ export class ContextMenu extends UIContainerPlugin {
     this.listenTo(
       this.container,
       Events.CONTAINER_CONTEXTMENU,
-      this.toggleContextMenu,
+      this.onContextMenu,
     )
-    this.listenTo(this.container, Events.CONTAINER_CLICK, this.hide)
+    this.listenTo(this.container, Events.CONTAINER_CLICK, this.onContainerClick)
   }
 
   /**
@@ -119,41 +110,66 @@ export class ContextMenu extends UIContainerPlugin {
     return super.destroy()
   }
 
-  private toggleContextMenu(event: MouseEvent) {
+  private onContainerClick() {
+    this.hide()
+  }
+
+  private onContextMenu(event: MouseEvent) {
+    if (!this.options.contextMenu?.options?.length) {
+      return
+    }
     event.preventDefault()
-    const offset = this.container?.$el.offset()
+    event.stopPropagation()
 
+    const offset = this.container?.$el.offset()
     this.show(event.pageY - offset.top, event.pageX - offset.left)
   }
 
   private show(top: number, left: number) {
-    this.hide()
-    if (
-      this.options.contextMenu &&
-      this.options.contextMenu.preventShowContextMenu
-    ) {
-      return
-    }
+    this.open = true
     this.$el.css({ top, left })
     this.$el.show()
   }
 
   private hide() {
+    this.open = false
     this.$el.hide()
   }
 
-  private onOpenMainPage() {
-    window.open(this.url, '_blank')
+  private runAction(event: MouseEvent) {
+    event.preventDefault()
+    event.stopPropagation()
+
+    const itemName = (event.currentTarget as HTMLButtonElement).dataset.name
+    if (!itemName) {
+      return
+    }
+    const item = this.options.contextMenu?.options.find(
+      (option: MenuOption) => option.name === itemName,
+    )
+    if (item?.handler) {
+      item.handler()
+    }
+    this.hide()
   }
 
   /**
    * @internal
    */
   override 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: MenuOption) => 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
   }

package/src/plugins/level-selector/__tests__/__snapshots__/QualityLevels.test.ts.snap

@@ -155,10 +155,10 @@ exports[`QualityLevels > options.restrictResolution > given vertical video forma
 
 exports[`QualityLevels > options.restrictResolution > initially > should render the restricted quality level label 1`] = `
 "<button class="gplayer-lite-btn gcore-skin-text-color gear-option" aria-haspopup="menu">
-    <span class="gear-option_hd-icon hidden">/assets/icons/new/hd.svg</span>
-    <span>quality</span>
-    <span class="gear-option_arrow-right-icon">/assets/icons/new/arrow-right.svg</span>
+    <span class="gear-option_icon hidden">/assets/icons/new/hd.svg</span>
+    <span class="gear-option_label">quality</span>
     <span class="gear-option_value">360p</span>
+    <span class="gear-option_arrow-right-icon">/assets/icons/new/arrow-right.svg</span>
 </button>
 "
 `;