fotoramajs 4.4.1 → 4.4.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fotoramajs (4.4.1)
+    fotoramajs (4.4.3)
       jquery-rails (>= 2.1.0)
       sprockets (>= 2)
 
@@ -20,7 +20,7 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    atomic (1.1.13)
+    atomic (1.1.14)
     builder (3.1.4)
     erubis (2.7.0)
     hike (1.2.3)
@@ -46,7 +46,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.18.1)
-    thread_safe (0.1.2)
+    thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
     tzinfo (0.3.37)

data/Rakefile

@@ -60,6 +60,10 @@ task :update do
     end
   end
 
+  def update_gemfile_lock
+    `#{Rake::DSL::RUBY} -S bundle`
+  end
+
   puts "Fetching tags"
   tag = github_tags('artpolikarpov/fotorama').last
 
@@ -71,6 +75,7 @@ task :update do
 
   puts "Update gem version"
   update_version(tag)
+  update_gemfile_lock
 
   puts "Done"
 end

data/lib/fotoramajs/version.rb

@@ -1,3 +1,3 @@
 module Fotoramajs
-  VERSION = "4.4.1"
+  VERSION = "4.4.3"
 end

data/vendor/assets/javascripts/fotorama.js

@@ -1,5 +1,5 @@
 /*!
- * Fotorama 4.4.1 | http://fotorama.io/license/
+ * Fotorama 4.4.3 | http://fotorama.io/license/
  */
 (function (window, document, location, $, undefined) {
   "use strict";
@@ -1061,7 +1061,7 @@ function touch ($el, options) {
         || (lastEvent && lastEvent.type !== e.type && preventEvent)
         || (targetIsSelectFLAG = options.select && $target.is(options.select, el))) return targetIsSelectFLAG;
 
-    touchFLAG = e.type.match(/^t/);
+    touchFLAG = e.type === 'touchstart';
     targetIsLinkFlag = $target.is('a, a *', el);
 
     extendEvent(e);
@@ -1091,7 +1091,7 @@ function touch ($el, options) {
     var xDiff = Math.abs(e._x - startEvent._x), // opt _x → _pageX
         yDiff = Math.abs(e._y - startEvent._y),
         xyDiff = xDiff - yDiff,
-        xWin = (tail.go || tail.x || xyDiff > 0) && !tail.noSwipe,
+        xWin = (tail.go || tail.x || xyDiff >= 0) && !tail.noSwipe,
         yWin = xyDiff < 0;
 
     if (touchFLAG && !tail.checked) {
@@ -1124,7 +1124,7 @@ function touch ($el, options) {
     preventEventTimeout = setTimeout(function () {
       preventEvent = false;
     }, 1000);
-    (options.onEnd || noop).call(el, {moved: tail.checked, $target: $target, control: controlTouch, touch: touchFLAG, startEvent: startEvent, aborted: !e});
+    (options.onEnd || noop).call(el, {moved: tail.checked, $target: $target, control: controlTouch, touch: touchFLAG, startEvent: startEvent, aborted: !e || e.type === 'MSPointerCancel'});
   }
 
   function onOtherStart () {
@@ -1322,7 +1322,7 @@ function moveOnTouch ($el, options) {
 
     time *= slowFLAG ? 10 : 1;
 
-    (options.onEnd || noop).call(el, $.extend(result, {pos: moveElPos, newPos: newPos, overPos: overPos, time: time, moved: longTouchFLAG ? snap : Math.abs(moveElPos - startElPos) > 3}));
+    (options.onEnd || noop).call(el, $.extend(result, {pos: moveElPos, newPos: newPos, overPos: overPos, time: time, moved: longTouchFLAG ? snap : Math.abs(moveElPos - startElPos) > (snap ? 0 : 3)}));
   }
 
   tail = $.extend(touch(options.$wrap, {
@@ -1339,7 +1339,7 @@ function wheel ($el, options) {
   var el = $el[0],
       lockFLAG,
       lastDirection,
-      /*unlockTimestamp,*/
+      lastNow,
       tail = {
         prevent: {}
       };
@@ -1349,25 +1349,26 @@ function wheel ($el, options) {
         xDelta = e.wheelDeltaX || -1 * e.deltaX || 0,
         xWin = Math.abs(xDelta) > Math.abs(yDelta),
         direction = getDirectionSign(xDelta < 0),
-        sameDirection = lastDirection === direction;
-
-    //console.log('direction', direction);
-    //console.log('lastDirection', lastDirection);
+        sameDirection = lastDirection === direction,
+        now = $.now(),
+        tooFast = now - lastNow < TOUCH_TIMEOUT;
 
     lastDirection = direction;
+    lastNow = now;
 
     if (!xWin || !tail.ok || tail.prevent[direction] && !lockFLAG) {
       return;
     } else {
       stopEvent(e, true);
-      if (lockFLAG && sameDirection /*|| $.now() - unlockTimestamp < TOUCH_TIMEOUT / 2*/) return;
+      if (lockFLAG && sameDirection && tooFast) {
+        return;
+      }
     }
 
     if (options.shift) {
       lockFLAG = true;
       clearTimeout(tail.t);
       tail.t = setTimeout(function () {
-        //unlockTimestamp = $.now();
         lockFLAG = false;
       }, SCROLL_LOCK_TIMEOUT);
     }
@@ -1399,7 +1400,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
       $wrap = $(div(wrapClass)),
       $stage = $(div(stageClass)).appendTo($wrap),
       stage = $stage[0],
-      
+
       $stageShaft = $(div(stageShaftClass)).appendTo($stage),
       $stageFrame = $(),
       $arrPrev = $(div(arrClass + ' ' + arrPrevClass, div(arrArrClass))),
@@ -1710,9 +1711,6 @@ jQuery.Fotorama = function ($fotorama, opts) {
 
     ooooStop();
 
-    // Glimpse
-    $stageShaft.css({left: opts.glimpse, right: opts.glimpse, width: 'auto'});
-
     $wrap
         .addClass(classes.add.join(' '))
         .removeClass(classes.remove.join(' '));
@@ -2009,6 +2007,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
       toDetach[STAGE_FRAME_KEY][normalizeIndex(index)] = $frame.css($.extend({left: o_fade ? 0 : getPosByIndex(index, measures.w, opts.margin, repositionIndex)}, o_fade && getDuration(0)));
 
       if (isDetached($frame[0])) {
+        //console.log('Append', normalizeIndex(index));
         $frame.appendTo($stageShaft);
         unloadVideo(dataFrame.$video);
       }
@@ -2182,12 +2181,16 @@ jQuery.Fotorama = function ($fotorama, opts) {
   function detachFrames (key) {
     var _toDetach = toDetach[key];
 
+    //console.log('_toDetach', _toDetach);
+    //console.log('activeIndexes', activeIndexes);
+
     $.each(activeIndexes, function (i, index) {
-      delete _toDetach[index];
+      delete _toDetach[normalizeIndex(index)];
     });
 
     $.each(_toDetach, function (index, $frame) {
       delete _toDetach[index];
+      //console.log('Detach', index);
       $frame.detach();
     });
   }
@@ -2343,14 +2346,13 @@ jQuery.Fotorama = function ($fotorama, opts) {
 
     that.activeFrame = activeFrame = data[activeIndex];
 
-    unloadVideo($videoPlaying, activeFrame.i !== data[normalizeIndex(repositionIndex)].i);
-
-    frameDraw(activeIndexes, 'stage');
-    stageFramePosition([dirtyIndex, getPrevIndex(dirtyIndex), getNextIndex(dirtyIndex)]);
-
-    updateTouchTails('go', true);
-
-    triggerEvent('show', options.direct);
+    //setTimeout(function () {
+      unloadVideo($videoPlaying, activeFrame.i !== data[normalizeIndex(repositionIndex)].i);
+      frameDraw(activeIndexes, 'stage');
+      stageFramePosition([dirtyIndex, getPrevIndex(dirtyIndex), getNextIndex(dirtyIndex)]);
+      updateTouchTails('go', true);
+      triggerEvent('show', options.direct);
+    //}, 0);
 
     var onEnd = that.show.onEnd = function (skipReposition) {
       if (onEnd.ok) return;
@@ -2509,7 +2511,9 @@ jQuery.Fotorama = function ($fotorama, opts) {
       width = measures.W = measures.w = $wrap.width();
 
       if (opts.glimpse) {
-        measures.w -= Math.round((numberFromPercent(opts.glimpse) / 100 * width || numberFromMeasure(opts.glimpse)) * 2);
+        // Glimpse
+        measures.w -= Math.round((numberFromPercent(opts.glimpse) / 100 * width || numberFromMeasure(opts.glimpse)) * 2)
+        $stageShaft.css({width: measures.w, marginLeft: (measures.W - measures.w) / 2});
       }
 
       //console.log('measures.W', measures.W);
@@ -2756,6 +2760,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
     onEnd: function (e, direction) {
       //console.log('wheel $stage onEnd', direction);
       onTouchStart();
+      onTouchEnd();
       that.show({index: direction, slow: e.altKey})
     }
   });
@@ -2764,6 +2769,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
     onEnd: function (e, direction) {
       //console.log('wheel $nav onEnd', direction);
       onTouchStart();
+      onTouchEnd();
       var newPos = stop($navShaft) + direction * .25;
       $navShaft.css(getTranslate(minMaxLimit(newPos, navShaftData.min, navShaftData.max)));
       o_shadows && setShadow($nav, findShadowEdge(newPos, navShaftData.min, navShaftData.max));
@@ -2907,6 +2913,7 @@ $.fn.fotorama = function (opts) {
                   height: null,
                   minheight: null,
                   maxheight: null,
+
                   ratio: null, // '16/9' || 500/333 || 1.5
 
                   margin: MARGIN,
@@ -2920,11 +2927,6 @@ $.fn.fotorama = function (opts) {
                   thumbmargin: MARGIN,
                   thumbborderwidth: MARGIN,
 
-                  arrows: true,
-                  click: true,
-                  swipe: true,
-                  trackpad: true,
-
                   allowfullscreen: false, // true || 'native'
 
                   fit: 'contain', // 'cover' || 'scaledown' || 'none'
@@ -2937,18 +2939,23 @@ $.fn.fotorama = function (opts) {
                   hash: false,
                   startindex: 0,
 
+                  loop: false,
+
                   autoplay: false,
                   stopautoplayontouch: true,
 
                   keyboard: false,
 
-                  loop: false,
+                  arrows: true,
+                  click: true,
+                  swipe: true,
+                  trackpad: true,
 
                   shuffle: false,
 
-                  shadows: true,
+                  direction: 'ltr', // 'rtl'
 
-                  direction: 'ltr' // 'rtl'
+                  shadows: true
                 },
                 window.fotoramaDefaults,
                 opts,
@@ -3007,7 +3014,7 @@ $.Fotorama.jst.video = function(v) {
 var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
 function print() { __p += __j.call(arguments, '') }
 __p += '<div class="fotorama__video"><iframe src="';
- print((v.type == 'youtube' ? 'http://youtube.com/embed/' + v.id +'?autoplay=1' : v.type == 'vimeo' ? 'http://player.vimeo.com/video/' + v.id + '?autoplay=1&badge=0' : v.id)  + '&' + v.s) ;
+ print((v.type == 'youtube' ? 'http://youtube.com/embed/' + v.id +'?autoplay=1' : v.type == 'vimeo' ? 'http://player.vimeo.com/video/' + v.id + '?autoplay=1&badge=0' : v.id)  + (v.s ? '&' + v.s : '')) ;
 __p += '" frameborder="0" allowfullscreen></iframe></div>';
 return __p
 };

data/vendor/assets/stylesheets/fotorama.css.scss

@@ -1,5 +1,5 @@
 /*!
- * Fotorama 4.4.1 | http://fotorama.io/license/
+ * Fotorama 4.4.3 | http://fotorama.io/license/
  */
 .fotorama__stage__shaft,
 .fotorama__stage__frame,
@@ -22,7 +22,7 @@
   min-height: 0 !important;
   border-radius: 0 !important;
   box-shadow: none !important;
-  padding: 0;
+  padding: 0 !important;
 }
 
 .fotorama__wrap .fotorama__grab {
@@ -96,11 +96,7 @@
 .fotorama__arr,
 .fotorama__fullscreen-icon,
 .fotorama__video-play,
-.fotorama__video-close,
-.fotorama__stage:before,
-.fotorama__stage:after,
-.fotorama__nav:before,
-.fotorama__nav:after {
+.fotorama__video-close {
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
@@ -228,6 +224,7 @@
 .fotorama__wrap {
   -webkit-text-size-adjust: 100%;
   position: relative;
+  direction: ltr;
 }
 
 .fotorama__wrap--rtl .fotorama__stage__frame {
@@ -305,7 +302,7 @@
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=0);
   opacity: 0;
-  border: 0;
+  border: none !important;
 }
 
 .fotorama__loaded .fotorama__img,
@@ -486,7 +483,7 @@
   width: 6px;
   height: 6px;
   border-radius: 6px;
-  background-color: #bfbfbf;
+  background-color: #7f7f7f;
   background-color: rgba(127, 127, 127, 0.5);
 }
 
@@ -505,17 +502,6 @@
   background-color: #7f7f7f;
 }
 
-.fotorama__wrap--css3 .fotorama__stage__shaft,
-.fotorama__wrap--css3 .fotorama__nav__shaft,
-.fotorama__wrap--css3 .fotorama__thumb-border,
-.fotorama__wrap--css3 .fotorama__stage__frame,
-.fotorama__wrap--css3 .fotorama__nav__frame,
-.fotorama__wrap--css3 .fotorama__img,
-.fotorama__wrap--css3 .fotorama__html,
-.fotorama__wrap--css3 .fotorama__caption {
-  -webkit-backface-visibility: hidden;
-}
-
 .fotorama__wrap--css3 .fotorama__img,
 .fotorama__wrap--css3 .fotorama__html,
 .fotorama__wrap--css3.fotorama__wrap--fade .fotorama__stage__frame,
@@ -541,6 +527,21 @@
   z-index: 10;
 }
 
+body,
+div,
+article,
+aside,
+footer,
+header,
+main,
+nav,
+section {
+  /* Force improvement of webkit mobile performance on sites using fotorama */
+  -webkit-backface-visibility: hidden;
+}
+
+/* Strange fix of the #66 issue (Firefox bug while sliding backwards) */
+
 @-moz-document url-prefix()  {
   .fotorama__active {
     box-shadow: 0 0 0 transparent;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fotoramajs
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -79,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -479234972122176432
+      hash: 1857401499460829857
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -479234972122176432
+      hash: 1857401499460829857
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23