Skip to content

Commit 593ed8e

Browse files
committed
Merge remote-tracking branch 'remotes/origin/MAGETWO-69567' into MPI-PR-Bugfixes
2 parents 74059e3 + a232e07 commit 593ed8e

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

lib/web/fotorama/fotorama.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,6 +1217,14 @@ fotoramaVersion = '4.6.4';
12171217
stopPropagation && e.stopPropagation && e.stopPropagation();
12181218
}
12191219

1220+
function stubEvent($el, eventType) {
1221+
$el.on(eventType, function (e) {
1222+
stopEvent(e, true);
1223+
1224+
return false;
1225+
});
1226+
}
1227+
12201228
function getDirectionSign(forward) {
12211229
return forward ? '>' : '<';
12221230
}
@@ -2150,6 +2158,11 @@ fotoramaVersion = '4.6.4';
21502158
if (o_allowFullScreen) {
21512159
$fullscreenIcon.prependTo($stage);
21522160
o_nativeFullScreen = FULLSCREEN && o_allowFullScreen === 'native';
2161+
2162+
// Due 300ms click delay on mobile devices
2163+
// we stub touchend and fallback to click.
2164+
// MAGETWO-69567
2165+
stubEvent($fullscreenIcon, 'touchend');
21532166
} else {
21542167
$fullscreenIcon.detach();
21552168
o_nativeFullScreen = false;

0 commit comments

Comments
 (0)