JS-200: Test existing accessibility features

Author: anastasiiabuniak

lib/web/fotorama/fotorama.js

@@ -91,7 +91,8 @@ fotoramaVersion = '4.6.4';
         verticalImageClass = _fotoramaClass + '_vertical_ratio';
     var JQUERY_VERSION = $ && $.fn.jquery.split('.');
 
-    var borderPos = 0;
+    var borderPos = 0,
+        curSlide = 1;
 
     if (!JQUERY_VERSION
         || JQUERY_VERSION[0] < 1
@@ -1616,9 +1617,9 @@ fotoramaVersion = '4.6.4';
                 if ($el.selector !== '.fotorama__nav-wrap .fotorama__nav .fotorama__nav__shaft') {
                     $el.css($.extend(getDuration(options.time), translate));
 
-                    if ($el.selector === ".fotorama__thumb-border") {
+                    if ($el.selector === "." + thumbBorderClass) {
 
-                        var slideLength = Math.floor($el.closest('.fotorama__wrap').width()/options.thumb.width),
+                        var slideLength = Math.floor($el.closest('.' + wrapClass).width() / options.thumb.width),
                             borderStep = options.thumb.margin,
                             slidePosition;
 
@@ -1642,7 +1643,8 @@ fotoramaVersion = '4.6.4';
                                 }
                             }  
                         }
-                        borderPos = options.pos;                    
+                        borderPos = options.pos;
+                        curSlide = Math.floor(borderPos / borderStep / slideLength) + 1;
                     }
                 }
             }
@@ -1655,7 +1657,7 @@ fotoramaVersion = '4.6.4';
         } else {
             $el.stop().animate(translate, options.time, BEZIER, onEndFn);
             options.measures.nw = -slidePosition + borderStep * (slideLength - 1);
-            $('.fotorama__nav__shaft').css($.extend(getDuration(options.time), translate));
+            $('.' + navShaftClass).css($.extend(getDuration(options.time), translate));
         }
     }
 
@@ -1666,7 +1668,7 @@ fotoramaVersion = '4.6.4';
         } else {
             options.measures.nw = -slidePosition + borderStep * (slideLength - 1);
         }
-        $('.fotorama__nav__shaft').css($.extend(getDuration(options.time), translate));
+        $('.' + navShaftClass).css($.extend(getDuration(options.time), translate));
     }
 
     function fade($el1, $el2, $frames, options, fadeStack, chain) {
@@ -2498,6 +2500,7 @@ fotoramaVersion = '4.6.4';
 
             lastOptions = $.extend({}, opts);
             setStagePosition();
+            that.showSlide(curSlide);
         }
 
         function normalizeIndex(index) {
@@ -2748,7 +2751,11 @@ fotoramaVersion = '4.6.4';
                 setTimeout(function () {
                     lockScroll($nav);
                 }, 0);
-                slideNavShaft({time: o_transitionDuration, guessIndex: $(this).data().eq, minMax: navShaftTouchTail});
+                if (!opts.carouselnavigation) {
+                    slideNavShaft({time: o_transitionDuration, guessIndex: $(this).data().eq, minMax: navShaftTouchTail});
+                } else {
+                    that.showSlide(Math.floor($(this).data().eq / slidesNumb) + 1)
+                }
             });
         }
 
@@ -3187,12 +3194,12 @@ fotoramaVersion = '4.6.4';
         }
 
         that.showSlide = function(index) {
-            if ((index > 0) && (index <= $navShaft.children().length - 1)) {
+            if (index > 0 && activeFrame) {
                 index --;
                 var borderStep = opts.navdir === 'vertical' ? 
                         opts.thumbheight + opts.thumbmargin :
                         opts.thumbwidth + opts.thumbmargin,
-                    slideLength = Math.floor($el.closest('.fotorama__wrap').width()/opts.thumbwidth),
+                    slideLength = Math.floor($('.' + wrapClass).width()/opts.thumbwidth),
                     options = {
                         time: opts.transitionduration,
                         direction: opts.navdir,
@@ -3337,6 +3344,10 @@ fotoramaVersion = '4.6.4';
             showedFLAG = typeof lastActiveIndex !== 'undefined' && lastActiveIndex !== activeIndex;
             lastActiveIndex = activeIndex;
 
+            if (opts.carouselnavigation) {
+                that.showSlide(curSlide);
+            }
+
             return this;
         };
 
@@ -3782,7 +3793,7 @@ fotoramaVersion = '4.6.4';
             onEnd: function (result) {
 
                 function onEnd() {
-                    slideNavShaft.l = opts.carouselnavigation ? slideDrag.slidePosition : result.newPos;
+                    slideNavShaft.l = opts.carouselnavigation ? slideDrag.slidePosition:  result.newPos;
                     releaseAutoplay();
                     changeAutoplay();
                     thumbsDraw(result.newPos, true);