Merge pull request #7494 from magento-atwix-pyrrans/delivery-bunch-2022-02-28

[Pyrrans] Delivery bunch from 03/07/2022

Author: xmav

app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

@@ -332,7 +332,7 @@
         <data key="telephone">333-33-333-33</data>
         <data key="country">Germany</data>
         <data key="state">Berlin</data>
-        <data key="vatNumber">DE265675123</data>
+        <data key="vatNumber">DE257486969</data>
     </entity>
     <entity name="US_Address_California">
         <data key="firstname">John</data>

app/code/Magento/ProductVideo/composer.json

@@ -16,7 +16,8 @@
     },
     "suggest": {
         "magento/module-customer": "*",
-        "magento/module-config": "*"
+        "magento/module-config": "*",
+        "magento/module-theme": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/ProductVideo/view/frontend/requirejs-config.js

@@ -7,10 +7,14 @@ var config = {
     map: {
         '*': {
             loadPlayer: 'Magento_ProductVideo/js/load-player',
-            fotoramaVideoEvents: 'Magento_ProductVideo/js/fotorama-add-video-events'
+            fotoramaVideoEvents: 'Magento_ProductVideo/js/fotorama-add-video-events',
+            'vimeoWrapper': 'vimeo/vimeo-wrapper'
         }
     },
     shim: {
-        vimeoAPI: {}
+        vimeoAPI: {},
+        'Magento_ProductVideo/js/load-player': {
+            deps: ['vimeoWrapper']
+        }
     }
 };

app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js

@@ -100,8 +100,7 @@ define([
             videoData: '',
             videoSettings: '',
             optionsVideoData: '',
-            dataMergeStrategy: 'replace',
-            vimeoJSFrameworkLoaded: false
+            dataMergeStrategy: 'replace'
         },
 
         /**
@@ -163,7 +162,6 @@ define([
             if (this._checkForVideoExist()) {
                 this._checkFullscreen();
                 this._listenForFullscreen();
-                this._checkForVimeo();
                 this._isVideoBase();
                 this._initFotoramaVideo();
                 this._attachFotoramaEvents();
@@ -396,27 +394,6 @@ define([
             return checker;
         },
 
-        /**
-         *
-         * @private
-         */
-        _checkForVimeo: function () {
-            var allVideoData = this.options.videoData,
-                videoItem;
-
-            if (window.Froogaloop) { // prevent duplicated initialization
-                return;
-            }
-
-            for (videoItem in allVideoData) {
-                if (allVideoData[videoItem].provider === this.VI) {
-                    this._loadVimeoJSFramework();
-
-                    return;
-                }
-            }
-        },
-
         /**
          *
          * @private
@@ -448,27 +425,6 @@ define([
             }
         },
 
-        /**
-         *
-         * @private
-         */
-        _loadVimeoJSFramework: function () {
-            var element = document.createElement('script'),
-                scriptTag = document.getElementsByTagName('script')[0];
-
-            element.async = true;
-            element.src = 'https://f.vimeocdn.com/js/froogaloop2.min.js';
-
-            /**
-             * Vimeo js framework on load callback.
-             */
-            element.onload = function () {
-                this.onVimeoJSFramework();
-                this.vimeoJSFrameworkLoaded = true;
-            }.bind(this);
-            scriptTag.parentNode.insertBefore(element, scriptTag);
-        },
-
         /**
          *
          * @param {Event} e
@@ -708,7 +664,7 @@ define([
                 $(event.target).removeClass(this.VU);
                 type = $(event.target).find('.' + this.PV).data('type');
 
-                if (this.vimeoJSFrameworkLoaded && type === this.VI) {
+                if (type === this.VI) {
                     $(event.target).find('.' + this.PV).productVideoLoader();
                 } else if (type === this.VI) {
                     this._showLoader();
@@ -732,8 +688,7 @@ define([
          * @private
          */
         _handleBaseVideo: function (fotorama, srcNumber) {
-            var waitForFroogaloop,
-                videoData = this.options.videoData,
+            var videoData = this.options.videoData,
                 activeIndex = fotorama.activeIndex,
                 number = parseInt(srcNumber, 10),
                 activeIndexIsBase = videoData[activeIndex];
@@ -743,22 +698,11 @@ define([
             }
 
             if (activeIndexIsBase && number === 1 && $(window).width() > this.MobileMaxWidth) {
-                if (this.options.videoData[fotorama.activeIndex].provider === this.VI) {
-                    waitForFroogaloop = setInterval($.proxy(function () {
-                        if (window.Froogaloop) {
-                            clearInterval(waitForFroogaloop);
-                            fotorama.requestFullScreen();
-                            this.fotoramaItem.data('fotorama').activeFrame.$stageFrame[0].trigger('click');
-                            this.Base = false;
-                        }
-                    }, this), 50);
-                } else { //if not a vimeo - play it immediately with a little lag in case for fotorama fullscreen
-                    setTimeout($.proxy(function () {
-                        fotorama.requestFullScreen();
-                        this.fotoramaItem.data('fotorama').activeFrame.$stageFrame[0].trigger('click');
-                        this.Base = false;
-                    }, this), 50);
-                }
+                setTimeout($.proxy(function () {
+                    fotorama.requestFullScreen();
+                    this.fotoramaItem.data('fotorama').activeFrame.$stageFrame[0].trigger('click');
+                    this.Base = false;
+                }, this), 50);
             }
         },
 

app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js

@@ -9,7 +9,8 @@
  */
 define([
     'jquery',
-    'jquery-ui-modules/widget'
+    'jquery-ui-modules/widget',
+    'vimeoWrapper'
 ], function ($) {
     'use strict';
 
@@ -307,7 +308,8 @@ define([
         _create: function () {
             var timestamp,
                 additionalParams = '',
-                src;
+                src,
+                id;
 
             this._initialize();
             timestamp = new Date().getTime();
@@ -325,10 +327,11 @@ define([
                 this._code +
                 timestamp +
                 additionalParams;
+            id = 'vimeo' + this._code + timestamp;
             this.element.append(
                 $('<iframe></iframe>')
                     .attr('frameborder', 0)
-                    .attr('id', 'vimeo' + this._code + timestamp)
+                    .attr('id', id)
                     .attr('width', this._width)
                     .attr('height', this._height)
                     .attr('src', src)
@@ -338,10 +341,11 @@ define([
                     .attr('referrerPolicy', 'origin')
                     .attr('allow', 'autoplay')
             );
-            this._player = window.$f(this.element.children(':first')[0]);
 
-            // Froogaloop throws error without a registered ready event
-            this._player.addEvent('ready', function (id) {
+            /* eslint-disable no-undef */
+            this._player = new Vimeo.Player(this.element.children(':first')[0]);
+
+            this._player.ready().then(function () {
                 $('#' + id).closest('.fotorama__stage__frame').addClass('fotorama__product-video--loaded');
             });
         },
@@ -350,23 +354,23 @@ define([
          * Play command for Vimeo
          */
         play: function () {
-            this._player.api('play');
+            this._player.play();
             this._playing = true;
         },
 
         /**
          * Pause command for Vimeo
          */
         pause: function () {
-            this._player.api('pause');
+            this._player.pause();
             this._playing = false;
         },
 
         /**
          * Stop command for Vimeo
          */
         stop: function () {
-            this._player.api('unload');
+            this._player.unload();
             this._playing = false;
         },
 

app/code/Magento/Theme/view/base/requirejs-config.js

@@ -45,7 +45,9 @@ var config = {
             'jquery-ui-modules/tabs': 'jquery/ui-modules/widgets/tabs',
             'jquery-ui-modules/tooltip': 'jquery/ui-modules/widgets/tooltip',
             'jquery-ui-modules/widget': 'jquery/ui-modules/widget',
-            'jquery-ui-modules/timepicker': 'jquery/timepicker'
+            'jquery-ui-modules/timepicker': 'jquery/timepicker',
+            'vimeo': 'vimeo/player',
+            'vimeoWrapper': 'vimeo/vimeo-wrapper'
         }
     },
     shim: {
@@ -57,7 +59,10 @@ var config = {
         'matchMedia': {
             'exports': 'mediaCheck'
         },
-        'magnifier/magnifier': ['jquery']
+        'magnifier/magnifier': ['jquery'],
+        'vimeo/player': {
+            'exports': 'Player'
+        }
     },
     paths: {
         'jquery/validate': 'jquery/jquery.validate',

composer.lock

@@ -16,6 +16,7 @@
 
 require __DIR__ . '/autoload.php';
 
+error_reporting(E_ALL);
 if (!defined('TESTS_TEMP_DIR')) {
     define('TESTS_TEMP_DIR', dirname(__DIR__) . '/tmp');
 }