Skip to content

Commit a7a7dbf

Browse files
committed
MAGETWO-50665: Processing pull request sky team
1 parent 3c9e45f commit a7a7dbf

File tree

7 files changed

+8
-25
lines changed

7 files changed

+8
-25
lines changed

app/design/frontend/Magento/luma/etc/view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
<var name="fullscreen">
204204
<var name="nav">thumbs</var> <!-- Fullscreen navigation style (false/thumbs/dots) -->
205205
<var name="loop">true</var> <!-- Fullscreen navigation loop (true/false/null) -->
206-
<var name="arrows">false</var> <!-- Turn on/off arrows on the sides preview in fullscreen (true/false/null) -->
206+
<var name="arrows">true</var> <!-- Turn on/off arrows on the sides preview in fullscreen (true/false/null) -->
207207
<var name="caption">false</var> <!-- Display alt text as image title in fullscreen(true/false) -->
208208
<var name="navdir">horizontal</var> <!--Sliding direction of thumbnails in fullscreen(horizontal/vertical) -->
209209
<var name="navarrows">false</var> <!-- Turn on/off on the thumbs navigation sides arrows(true/false) -->

lib/web/mage/gallery/module/_extends.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// /**
2-
// * Copyright © 2015 Magento. All rights reserved.
2+
// * Copyright © 2016 Magento. All rights reserved.
33
// * See COPYING.txt for license details.
44
// */
55

lib/web/mage/gallery/module/_focus.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// /**
2-
// * Copyright © 2015 Magento. All rights reserved.
2+
// * Copyright © 2016 Magento. All rights reserved.
33
// * See COPYING.txt for license details.
44
// */
55

lib/web/mage/gallery/module/_fullscreen.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// /**
2-
// * Copyright © 2015 Magento. All rights reserved.
2+
// * Copyright © 2016 Magento. All rights reserved.
33
// * See COPYING.txt for license details.
44
// */
55

lib/web/mage/gallery/module/_mixins.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// /**
2-
// * Copyright © 2015 Magento. All rights reserved.
2+
// * Copyright © 2016 Magento. All rights reserved.
33
// * See COPYING.txt for license details.
44
// */
55

lib/web/mage/gallery/module/_variables.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
// * Copyright © 2015 Magento. All rights reserved.
1+
// * Copyright © 2016 Magento. All rights reserved.
32
// * See COPYING.txt for license details.
43
// */
54
// /**

lib/web/magnifier/magnify.js

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ define([
9090
}
9191

9292
function toggleZoomable($image, flag) {
93-
console.log('toggleZoomable',flag);
9493
if (flag) {
9594
$image.css({
9695
'min-width': $image.width(),
@@ -112,7 +111,6 @@ console.log('toggleZoomable',flag);
112111
}
113112

114113
function resetVars($image) {
115-
console.log('resetVars')
116114
allowZoomIn = true;
117115
allowZoomOut = dragFlag = transitionActive = false;
118116
$image.hasClass(imageDraggableClass) && $image.removeClass(imageDraggableClass);
@@ -516,7 +514,7 @@ console.log('toggleZoomable',flag);
516514
var top = +imagePosY + dy,
517515
left = +imagePosX + dx,
518516
swipeCondition = $image.width() / 10 + 20;
519-
console.log('shift');
517+
520518
dragFlag = true;
521519

522520
if (($image.offset().left === $imageContainer.offset().left + $imageContainer.width() - $image.width() && e.keyCode === 39) ||
@@ -544,7 +542,6 @@ console.log('shift');
544542
} else {
545543
top = $imageContainer.offset().top < top ? 0 : top;
546544
}
547-
console.log('top', top, 'bottom /')
548545
$image.offset({
549546
'top': top
550547
});
@@ -558,7 +555,6 @@ console.log('shift');
558555
} else {
559556
left = $imageContainer.offset().left < left ? $imageContainer.offset().left : left;
560557
}
561-
console.log('left', left, 'right /')
562558
$image.offset({
563559
'left': left
564560
});
@@ -580,8 +576,6 @@ console.log('shift');
580576
* @param e - event object
581577
*/
582578
function dblClickHandler(e) {
583-
console.log('dblclick');
584-
585579
var imgOriginalSize = getImageSize($image[0].src),
586580
proportions;
587581

@@ -637,7 +631,6 @@ console.log('shift');
637631
isDragActive = true;
638632
}
639633
}
640-
console.log('touchstart');
641634

642635
if ($image.offset() && ($image.width() > $imageContainer.width())) {
643636
endX = $image.offset().left;
@@ -679,11 +672,7 @@ console.log('shift');
679672
clientY = touch.pageY;
680673
}
681674

682-
//if (allowZoomOut && (!isTouchEnabled || !tapedTwice)) {
683-
shiftImage(clientX - startX, clientY - startY, e);
684-
//}
685-
console.log('touchmove');
686-
675+
shiftImage(clientX - startX, clientY - startY, e);
687676
}
688677
}
689678
});
@@ -761,8 +750,6 @@ console.log('shift');
761750
$(document).keydown(keyboardNavigation);
762751

763752
$(document).on(isTouchEnabled ? 'touchend' : 'mouseup pointerup MSPointerUp', function (e) {
764-
console.log('touchend document');
765-
766753
if (gallery.fullScreen) {
767754

768755
if ($image.offset() && ($image.width() > $imageContainer.width())) {
@@ -776,7 +763,6 @@ console.log('shift');
776763

777764
isTouchEnabled && $image.off('touchend');
778765
isTouchEnabled && $image.on('touchend', function (e) {
779-
console.log('touchend');
780766
if (e.originalEvent.touches.length === 0) {
781767
if (!tapedTwice) {
782768
tapedTwice = true;
@@ -934,7 +920,6 @@ console.log('shift');
934920
})
935921
.on('fotorama:fullscreenenter fotorama:showend', function (e, fotorama) {
936922
hideMagnifier();
937-
console.log('showend')
938923
!tapedTwice && resetVars($(fullscreenImageSelector));
939924
magnifierFullscreen(fotorama);
940925
mousewheel(e, fotorama, element);
@@ -953,7 +938,6 @@ console.log('shift');
953938
magnifierFullscreen(fotorama);
954939
})
955940
.on('fotorama:show', function (e, fotorama) {
956-
console.log('show event');
957941
$prevImage = $(fullscreenImageSelector);
958942
hideMagnifier();
959943
!tapedTwice && resetVars($(fullscreenImageSelector));

0 commit comments

Comments
 (0)