cloudinary-video-player 2.4.2-edge.0 → 2.5.0

package/dist/cld-video-player.js

@@ -8979,7 +8979,7 @@ const EVENT_DEFAULTS = {
 const DEFAULT_OPTIONS = {
   events: DEFAULT_EVENTS,
   category: 'Video',
-  defaultLabel: player => player.cloudinary && player.cloudinary.currentPublicId() || player.currentSource().src
+  defaultLabel: player => player.cloudinary?.currentPublicId() || player.currentSource().src
 };
 class AnalyticsPlugin {
   constructor(player) {
@@ -9189,13 +9189,12 @@ class AnalyticsPlugin {
       nonInteraction = false
     } = _ref;
     const eventData = {
-      eventCategory: this.options.category,
-      eventAction: action,
-      eventLabel: label || this.options.defaultLabel(this.player),
-      eventValue: value || Math.round(this.player.currentTime()),
-      nonInteraction: nonInteraction
+      event_category: this.options.category,
+      event_label: label || this.options.defaultLabel(this.player),
+      value: value || Math.round(this.player.currentTime()),
+      non_interaction: nonInteraction
     };
-    window.ga('send', 'event', eventData);
+    window.gtag('event', action, eventData);
   }
   videoload() {
     this.track({
@@ -9389,7 +9388,7 @@ class CloudinaryAnalytics {
       this.cloudinaryAnalytics.startManualTracking(metadata, {
         ...(lodash_isPlainObject__WEBPACK_IMPORTED_MODULE_1___default()(this.analyticsOptions) ? this.analyticsOptions : {}),
         videoPlayerType: 'cloudinary video player',
-        videoPlayerVersion: "2.4.2-edge.0"
+        videoPlayerVersion: "2.5.0"
       });
     } else if (this.currentVideMetadata.cloudName !== metadata.cloudName || this.currentVideMetadata.publicId !== metadata.publicId) {
       this.cloudinaryAnalytics.stopManualTracking();
@@ -9762,7 +9761,7 @@ class CloudinaryContext {
       options.sourceTypes = options.sourceTypes || _this.sourceTypes();
       options.poster = options.poster || posterOptionsForCurrent();
       options.queryParams = Object.assign(options.queryParams || {}, options.usageReport ? {
-        _s: `vp-${"2.4.2-edge.0"}`
+        _s: `vp-${"2.5.0"}`
       } : {});
       if (options.sourceTypes.indexOf('audio') > -1) {
         builtSrc = new _models_audio_source_audio_source__WEBPACK_IMPORTED_MODULE_7__["default"](publicId, options);
@@ -11029,7 +11028,7 @@ const contextMenuContent = player => {
   const isFullscreen = player.isFullscreen();
   const aboutMenuItem = {
     class: 'player-version',
-    label: 'Cloudinary Player v' + "2.4.2-edge.0"
+    label: 'Cloudinary Player v' + "2.5.0"
   };
   if (!player.controls()) {
     return [aboutMenuItem];
@@ -13812,7 +13811,7 @@ class VideoPlayer extends _utils__WEBPACK_IMPORTED_MODULE_9__["default"].mixin(_
       const analyticsData = (0,_utils_get_analytics_player_options__WEBPACK_IMPORTED_MODULE_18__.getAnalyticsFromPlayerOptions)(options);
       const analyticsParams = new URLSearchParams(analyticsData).toString();
       const baseParams = new URLSearchParams({
-        vpVersion: "2.4.2-edge.0",
+        vpVersion: "2.5.0",
         vpInstanceId: this.getVPInstanceId(),
         // #if (process.env.WEBPACK_BUILD_LIGHT)
         //         vpLightBuild: true,
@@ -14096,8 +14095,8 @@ class VideoPlayer extends _utils__WEBPACK_IMPORTED_MODULE_9__["default"].mixin(_
   }
   _initAnalytics() {
     const analyticsOpts = this.playerOptions.analytics;
-    if (!window.ga && analyticsOpts && this.playerOptions.debug) {
-      console.error('Google Analytics script is missing');
+    if (!window.gtag && analyticsOpts) {
+      console.error('Google Analytics script (gtag) is missing.');
       return;
     }
     if (analyticsOpts) {

package/dist/cld-video-player.light.js

@@ -1008,7 +1008,7 @@ const EVENT_DEFAULTS = {
 const DEFAULT_OPTIONS = {
   events: DEFAULT_EVENTS,
   category: 'Video',
-  defaultLabel: player => player.cloudinary && player.cloudinary.currentPublicId() || player.currentSource().src
+  defaultLabel: player => player.cloudinary?.currentPublicId() || player.currentSource().src
 };
 class AnalyticsPlugin {
   constructor(player) {
@@ -1218,13 +1218,12 @@ class AnalyticsPlugin {
       nonInteraction = false
     } = _ref;
     const eventData = {
-      eventCategory: this.options.category,
-      eventAction: action,
-      eventLabel: label || this.options.defaultLabel(this.player),
-      eventValue: value || Math.round(this.player.currentTime()),
-      nonInteraction: nonInteraction
+      event_category: this.options.category,
+      event_label: label || this.options.defaultLabel(this.player),
+      value: value || Math.round(this.player.currentTime()),
+      non_interaction: nonInteraction
     };
-    window.ga('send', 'event', eventData);
+    window.gtag('event', action, eventData);
   }
   videoload() {
     this.track({
@@ -1418,7 +1417,7 @@ class CloudinaryAnalytics {
       this.cloudinaryAnalytics.startManualTracking(metadata, {
         ...(lodash_isPlainObject__WEBPACK_IMPORTED_MODULE_1___default()(this.analyticsOptions) ? this.analyticsOptions : {}),
         videoPlayerType: 'cloudinary video player',
-        videoPlayerVersion: "2.4.2-edge.0"
+        videoPlayerVersion: "2.5.0"
       });
     } else if (this.currentVideMetadata.cloudName !== metadata.cloudName || this.currentVideMetadata.publicId !== metadata.publicId) {
       this.cloudinaryAnalytics.stopManualTracking();
@@ -1791,7 +1790,7 @@ class CloudinaryContext {
       options.sourceTypes = options.sourceTypes || _this.sourceTypes();
       options.poster = options.poster || posterOptionsForCurrent();
       options.queryParams = Object.assign(options.queryParams || {}, options.usageReport ? {
-        _s: `vp-${"2.4.2-edge.0"}`
+        _s: `vp-${"2.5.0"}`
       } : {});
       if (options.sourceTypes.indexOf('audio') > -1) {
         builtSrc = new _models_audio_source_audio_source__WEBPACK_IMPORTED_MODULE_7__["default"](publicId, options);
@@ -3058,7 +3057,7 @@ const contextMenuContent = player => {
   const isFullscreen = player.isFullscreen();
   const aboutMenuItem = {
     class: 'player-version',
-    label: 'Cloudinary Player v' + "2.4.2-edge.0"
+    label: 'Cloudinary Player v' + "2.5.0"
   };
   if (!player.controls()) {
     return [aboutMenuItem];
@@ -5553,7 +5552,7 @@ class VideoPlayer extends _utils__WEBPACK_IMPORTED_MODULE_9__["default"].mixin(_
       const analyticsData = (0,_utils_get_analytics_player_options__WEBPACK_IMPORTED_MODULE_18__.getAnalyticsFromPlayerOptions)(options);
       const analyticsParams = new URLSearchParams(analyticsData).toString();
       const baseParams = new URLSearchParams({
-        vpVersion: "2.4.2-edge.0",
+        vpVersion: "2.5.0",
         vpInstanceId: this.getVPInstanceId(),
         // #if (process.env.WEBPACK_BUILD_LIGHT)
         vpLightBuild: true,
@@ -5836,8 +5835,8 @@ class VideoPlayer extends _utils__WEBPACK_IMPORTED_MODULE_9__["default"].mixin(_
   }
   _initAnalytics() {
     const analyticsOpts = this.playerOptions.analytics;
-    if (!window.ga && analyticsOpts && this.playerOptions.debug) {
-      console.error('Google Analytics script is missing');
+    if (!window.gtag && analyticsOpts) {
+      console.error('Google Analytics script (gtag) is missing.');
       return;
     }
     if (analyticsOpts) {