Merge branch 'MAGETWO-62602' of github.com:magento-east/magento2ce into pr-dev

Sergey Shvets · Sergey Shvets · commit d3a7066ea9ad · 2016-12-30T10:30:27.000+02:00
diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js b/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js
@@ -317,7 +317,7 @@ define(['jquery', 'jquery/ui'], function ($) {
             if (this._loop) {
                 additionalParams += '&loop=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 +

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ define(['jquery', 'jquery/ui'], function ($) {`
`317`	`317`	`if (this._loop) {`
`318`	`318`	`additionalParams += '&loop=1';`
`319`	`319`	`}`
`320`		`- src = 'http://player.vimeo.com/video/' +`
	`320`	`+ src = window.location.protocol + '//player.vimeo.com/video/' +`
`321`	`321`	`this._code + '?api=1&player_id=vimeo' +`
`322`	`322`	`this._code +`
`323`	`323`	`timestamp +`