Skip to content

Commit 12dc731

Browse files
committed
Merge branch 'MAGETWO-45071' of github.corp.magento.com:magento-vanilla/magento2ce into PR
2 parents 3d3497a + 9f622e8 commit 12dc731

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ define([
506506
var self = this;
507507

508508
$image.find('.magnify-lens').remove();
509-
$image.on('click', function () {
509+
$image.on('click tap', function () {
510510
if ($(this).hasClass('video-unplayed') && $(this).find('iframe').length === 0) {
511511
$('.fotorama__arr--next').hide();
512512
$('.fotorama__arr--prev').hide();

lib/web/magnifier/magnifier.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,15 +488,21 @@
488488
} else {
489489
var top = options.top + 'px';
490490
}
491-
largeWrapper[0].style.top = top.replace("%px", "%");
491+
492+
if (largeWrapper.length) {
493+
largeWrapper[0].style.top = top.replace("%px", "%");
494+
}
492495
}
493496
if (options.left) {
494497
if (typeof options.left == 'function') {
495498
var left = options.left() + 'px';
496499
} else {
497500
var left = options.left + 'px';
498501
}
499-
largeWrapper[0].style.left = left.replace("%px", "%");
502+
503+
if (largeWrapper.length) {
504+
largeWrapper[0].style.left = left.replace("%px", "%");
505+
}
500506
}
501507

502508
data[idx] = {

0 commit comments

Comments
 (0)