Skip to content

Commit 54e2592

Browse files
author
Dmytro Vilchynskyi
committed
Merge remote-tracking branch 'origin/2.1-develop' into MAGETWO-72280
2 parents f8d3116 + 87046fa commit 54e2592

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ define([
303303
additionalParams += '&autoplay=1';
304304
}
305305

306-
src = window.location.protocol + '//player.vimeo.com/video/' +
306+
src = 'https://player.vimeo.com/video/' +
307307
this._code + '?api=1&player_id=vimeo' +
308308
this._code +
309309
timestamp +
@@ -526,7 +526,7 @@ define([
526526
);
527527
} else if (type === 'vimeo') {
528528
$.ajax({
529-
url: window.location.protocol + '//www.vimeo.com/api/v2/video/' + id + '.json',
529+
url: 'https://www.vimeo.com/api/v2/video/' + id + '.json',
530530
dataType: 'jsonp',
531531
data: {
532532
format: 'json'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ define(['jquery', 'jquery/ui'], function ($) {
317317
if (this._loop) {
318318
additionalParams += '&loop=1';
319319
}
320-
src = 'http://player.vimeo.com/video/' +
320+
src = 'https://player.vimeo.com/video/' +
321321
this._code + '?api=1&player_id=vimeo' +
322322
this._code +
323323
timestamp +

app/code/Magento/Review/view/frontend/templates/form.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<?php if ($block->getRatings() && $block->getRatings()->getSize()): ?>
2323
<span id="input-message-box"></span>
2424
<fieldset class="field required review-field-ratings">
25-
<legend class="label"><span><?php /* @escapeNotVerified */ echo __('Your Rating') ?><span></legend><br/>
25+
<legend class="label"><span><?php /* @escapeNotVerified */ echo __('Your Rating') ?></span></legend><br/>
2626
<div class="control">
2727
<div class="nested" id="product-review-table">
2828
<?php foreach ($block->getRatings() as $_rating): ?>

0 commit comments

Comments
 (0)