Merge pull request #129 from magento-vanilla/PR

[Vanilla] Bug Fixes - Product Video

Author: Tang, Yu(ytang1)

app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php

@@ -128,7 +128,7 @@ protected function retrieveRemoteImage($fileUrl, $localFilePath)
         $image = $this->curl->read();
         if (empty($image)) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Could not get video information. Please check your connection and try again.')
+                __('Could not get preview image information. Please check your connection and try again.')
             );
         }
         $this->fileUtility->saveFile($localFilePath, $image);

app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js

@@ -303,7 +303,7 @@ require([
                     additionalParams += '&autoplay=1';
                 }
 
-                src = 'http://player.vimeo.com/video/' +
+                src = window.location.protocol + '//player.vimeo.com/video/' +
                     this._code + '?api=1&player_id=vimeo' +
                     this._code +
                     timestamp +
@@ -483,7 +483,7 @@ require([
                         }
                     );
                 } else if (type === 'vimeo') {
-                    $.getJSON('http://www.vimeo.com/api/v2/video/' + id + '.json?callback=?',
+                    $.getJSON(window.location.protocol + '//www.vimeo.com/api/v2/video/' + id + '.json?callback=?',
                         {
                             format: 'json'
                         },

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

@@ -508,6 +508,9 @@ define([
             $image.find('.magnify-lens').remove();
             $image.on('click', function () {
                 if ($(this).hasClass('video-unplayed') && $(this).find('iframe').length === 0) {
+                    $('.fotorama__arr--next').hide();
+                    $('.fotorama__arr--prev').hide();
+
                     $(this).removeClass('video-unplayed');
                     $(this).find('.' + PV).productVideoLoader();
 
@@ -611,6 +614,8 @@ define([
                 $(this).remove();
                 $item.append(cloneVideoDiv);
                 $item.addClass('video-unplayed');
+                $('.fotorama__arr--next').show();
+                $('.fotorama__arr--prev').show();
                 self._hideCloseVideo();
 
             });

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

@@ -327,6 +327,9 @@ define(['jquery', 'jquery/ui'], function ($) {
                     .attr('width', this._width)
                     .attr('height', this._height)
                     .attr('src', src)
+                    .attr('webkitallowfullscreen', '')
+                    .attr('mozallowfullscreen', '')
+                    .attr('allowfullscreen', '')
             );
             this._player = window.$f(this.element.children(':first')[0]);
 

lib/web/fotorama/fotorama.js

@@ -3506,6 +3506,13 @@ fotoramaVersion = '4.6.4';
 
         that.requestFullScreen = function () {
             if (o_allowFullScreen && !that.fullScreen) {
+
+                //check that this is not video
+                var isVideo = $((that.activeFrame || {}).$stageFrame || {}).hasClass('fotorama-video-container');
+                if(isVideo) {
+                    return;
+                }
+
                 scrollTop = $WINDOW.scrollTop();
                 scrollLeft = $WINDOW.scrollLeft();