fotoramajs 4.3.3 → 4.3.4.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fotoramajs (4.3.3)
+    fotoramajs (4.3.4.1)
       jquery-rails (>= 2.1.0)
       sprockets (>= 2)
 
@@ -30,7 +30,7 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     minitest (4.7.5)
-    multi_json (1.7.9)
+    multi_json (1.8.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)

data/lib/fotoramajs/version.rb

@@ -1,3 +1,3 @@
 module Fotoramajs
-  VERSION = "4.3.3"
+  VERSION = "4.3.4.1"
 end

data/vendor/assets/javascripts/fotorama.js

@@ -1,7 +1,7 @@
 /*!
- * Fotorama 4.3.3 | http://fotorama.io/license/
+ * Fotorama 4.3.4.1 | http://fotorama.io/license/
  */
-(function (window, document, $, undefined) {
+(function (window, document, location, $, undefined) {
   "use strict";
 // My Underscore :-)
 var _ = {};
@@ -543,7 +543,7 @@ function bindTransitionEnd ($el) {
       };
   el.addEventListener(transitionEndEvent[Modernizr.prefixed('transition')], function (e) {
     elData.tProp && e.propertyName.match(elData.tProp) && elData.onEndFn();
-  });
+  }, false);
   elData.tEnd = true;
 }
 
@@ -838,9 +838,9 @@ function findShadowEdge (pos, min, max) {
   return min === max ? false : pos <= min ? 'left' : pos >= max ? 'right' : 'left right';
 }
 
-function getIndexFromHash (hash, data, ok) {
+function getIndexFromHash (hash, data, ok, startindex) {
   if (!ok) return false;
-  if (!isNaN(hash)) return hash - 1;
+  if (!isNaN(hash)) return hash - (startindex ? 0 : 1);
 
   var index;
 
@@ -1075,9 +1075,11 @@ function touch ($el, options) {
         yWin = xyDiff < 0;
 
     if (touchFLAG && !tail.checked) {
-      touchEnabledFLAG = xWin;
-      touchEnabledFLAG && e.preventDefault();
+      if (touchEnabledFLAG = xWin) {
+        e.preventDefault();
+      }
     } else {
+      //console.log('onMove e.preventDefault');
       e.preventDefault();
       (options.onMove || noop).call(el, e, {touch: touchFLAG});
     }
@@ -1106,6 +1108,7 @@ function touch ($el, options) {
   }
 
   function onOtherStart () {
+    if (tail.flow) return;
     clearTimeout(docTouchTimeout);
     docTouchTimeout = setTimeout(function () {
       tail.flow = true;
@@ -1113,6 +1116,7 @@ function touch ($el, options) {
   }
 
   function onOtherEnd () {
+    if (!tail.flow) return;
     clearTimeout(docTouchTimeout);
     docTouchTimeout = setTimeout(function () {
       tail.flow = false;
@@ -1120,19 +1124,20 @@ function touch ($el, options) {
   }
 
   if (MS_POINTER) {
-    el[addEventListener]('MSPointerDown', onStart);
-    document[addEventListener]('MSPointerMove', onMove);
-    document[addEventListener]('MSPointerCancel', onEnd);
-    document[addEventListener]('MSPointerUp', onEnd);
+    el[addEventListener]('MSPointerDown', onStart, false);
+    document[addEventListener]('MSPointerMove', onMove, false);
+    document[addEventListener]('MSPointerCancel', onEnd, false);
+    document[addEventListener]('MSPointerUp', onEnd, false);
   } else {
     if (el[addEventListener]) {
-      el[addEventListener]('touchstart', onStart);
-      el[addEventListener]('touchmove', onMove);
-      el[addEventListener]('touchend', onEnd);
+      el[addEventListener]('touchstart', onStart, false);
+      el[addEventListener]('touchmove', onMove, false);
+      el[addEventListener]('touchend', onEnd, false);
 
-      document[addEventListener]('touchstart', onOtherStart);
-      document[addEventListener]('touchend', onOtherEnd);
-      window[addEventListener]('scroll', onOtherEnd);
+      document[addEventListener]('touchstart', onOtherStart, false);
+      document[addEventListener]('touchend', onOtherEnd, false);
+      document[addEventListener]('touchcancel', onOtherEnd, false);
+      window[addEventListener]('scroll', onOtherEnd, false);
     }
 
     $el.on('mousedown', onStart);
@@ -1219,7 +1224,7 @@ function moveOnTouch ($el, options) {
       }
 
       if (!tail.noMove) {
-        $el.css(getTranslate(moveElPos));
+        $el.css(getTranslate(moveElPos, options._001));
         if (!movedFLAG) {
           movedFLAG = true;
           // only for mouse
@@ -1312,27 +1317,7 @@ function moveOnTouch ($el, options) {
 
   return tail;
 }
-var $oooo = $(div('', div(ooooClass))),
-    ooooInterval,
-    ooooStep = function () {
-      $oooo.attr('class', ooooClass + ' ' + ooooClass + '--' + ooooI);
-      ooooI++;
-      if (ooooI > 4) ooooI = 0;
-    },
-    ooooI;
-
-function ooooStart ($el) {
-  ooooStop(true);
-  $oooo.appendTo($el);
-  ooooI = 0;
-  ooooStep();
-  ooooInterval = setInterval(ooooStep, 200);
-}
 
-function ooooStop (leave) {
-  leave || $oooo.detach();
-  clearInterval(ooooInterval);
-}
 
 jQuery.Fotorama = function ($fotorama, opts) {
   $HTML = $HTML || $('html');
@@ -1511,7 +1496,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
     if (FLAG) {
       $fotorama
           .html('')
-          .addClass(stampClass)
+          .addClass(_fotoramaClass + ' ' + stampClass)
           .append($wrap)
           .before($style)
           .before($anchor);
@@ -1863,6 +1848,28 @@ jQuery.Fotorama = function ($fotorama, opts) {
     });
   }
 
+  var $oooo = $(div('', div(ooooClass))),
+      ooooInterval,
+      ooooStep = function () {
+        $oooo.attr('class', ooooClass + ' ' + ooooClass + '--' + ooooI);
+        ooooI++;
+        if (ooooI > 4) ooooI = 0;
+      },
+      ooooI;
+
+  function ooooStart ($el) {
+    ooooStop(true);
+    $oooo.appendTo($el);
+    ooooI = 0;
+    ooooStep();
+    ooooInterval = setInterval(ooooStep, 200);
+  }
+
+  function ooooStop (leave) {
+    leave || $oooo.detach();
+    clearInterval(ooooInterval);
+  }
+
   function updateFotoramaState () {
     var $frame = that.activeFrame[STAGE_FRAME_KEY];
 
@@ -2193,15 +2200,17 @@ jQuery.Fotorama = function ($fotorama, opts) {
 
     var _activeIndex = activeIndex;
 
-    changeAutoplay.t = setTimeout(function () {
-      var frameData = that.activeFrame[STAGE_FRAME_KEY].data();
-      waitFor(function () {
-        return frameData.state || _activeIndex !== activeIndex;
-      }, function () {
+
+    var frameData = that.activeFrame[STAGE_FRAME_KEY].data();
+    waitFor(function () {
+      return frameData.state || _activeIndex !== activeIndex;
+    }, function () {
+      changeAutoplay.t = setTimeout(function () {
         if (pausedAutoplayFLAG || _activeIndex !== activeIndex) return;
         that.show(o_loop ? '>' : normalizeIndex(activeIndex + 1));
-      });
-    }, opts.autoplay);
+      }, opts.autoplay);
+    });
+
   }
 
   that.startAutoplay = function (interval) {
@@ -2395,7 +2404,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
       if (data && !fullScreenApi.is() && !$videoPlaying) {
         cancelFullScreen();
       }
-    });
+    }, false);
   }
 
   that.resize = function (options) {
@@ -2541,7 +2550,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
     if (stageShaftTouchTail.flow) return;
 
     var x = e ? e.pageX : stageCursor.x,
-        pointerFLAG = !disableDirrection(getDirection(x)) && opts.click;
+        pointerFLAG = e && !disableDirrection(getDirection(x)) && opts.click;
 
     if (stageCursor.p !== pointerFLAG
         && (o_fade || !opts.swipe)
@@ -2690,9 +2699,10 @@ jQuery.Fotorama = function ($fotorama, opts) {
     setOptions();
 
     if (!ready.ok) {
+      var _startindex;
       // Only first time
-      if (opts.hash && location.hash) {
-        startIndex = getIndexFromHash(location.hash.replace(/^#/, ''), data, that.index === 0);
+      if ((_startindex = opts.startindex) || opts.hash && location.hash) {
+        startIndex = getIndexFromHash(_startindex || location.hash.replace(/^#/, ''), data, that.index === 0 || _startindex, _startindex);
       }
       activeIndex = repositionIndex = dirtyIndex = lastActiveIndex = startIndex = edgeIndex(startIndex) || 0;
     }
@@ -2785,6 +2795,7 @@ $.fn.fotorama = function (opts) {
                   captions: true,
 
                   hash: false,
+                  startindex: 0,
 
                   autoplay: false,
                   stopautoplayontouch: true,
@@ -2860,4 +2871,4 @@ return __p
 $(function () {
   $('.' + _fotoramaClass + ':not([data-auto="false"])').fotorama();
 });
-})(window, document, jQuery);
+})(window, document, location, jQuery);

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

@@ -1,5 +1,5 @@
 /*!
- * Fotorama 4.3.3 | http://fotorama.io/license/
+ * Fotorama 4.3.4.1 | http://fotorama.io/license/
  */
 .fotorama__stage__shaft,
 .fotorama__stage__frame,
@@ -46,9 +46,9 @@
 
 .fotorama__img,
 .fotorama__oooo {
-  position: absolute;
-  top: 50%;
-  left: 50%;
+  position: absolute !important;
+  top: 50% !important;
+  left: 50% !important;
 }
 
 .fotorama__img {
@@ -85,7 +85,6 @@
 .fotorama__wrap--css3 .fotorama__nav__shaft,
 .fotorama__wrap--css3 .fotorama__thumb-border {
   -webkit-transition-property: -webkit-transform, width;
-  transition-property: -ms-transform, width;
   transition-property: transform, width;
   -webkit-transition-timing-function: cubic-bezier(0.1, 0, 0.25, 1);
   transition-timing-function: cubic-bezier(0.1, 0, 0.25, 1);
@@ -186,6 +185,7 @@
 
 .fotorama {
   min-width: 1px;
+  overflow: hidden;
 }
 
 .fotorama > * {
@@ -249,21 +249,6 @@
   opacity: 1 !important;
 }
 
-.fotorama__img {
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  -webkit-filter: alpha(opacity=0);
-  filter: alpha(opacity=0);
-  opacity: 0;
-}
-
-.fotorama__loaded .fotorama__img,
-.fotorama__error .fotorama__img {
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-  -webkit-filter: alpha(opacity=100);
-  filter: alpha(opacity=100);
-  opacity: 1;
-}
-
 .fotorama__stage__frame {
   overflow: hidden;
 }
@@ -278,7 +263,6 @@
 
 .fotorama__wrap--fade .fotorama__stage__frame.fotorama__active {
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-  -webkit-filter: alpha(opacity=100);
   filter: alpha(opacity=100);
   opacity: 1;
 }
@@ -310,14 +294,22 @@
 .fotorama__wrap--video .fotorama__stage__frame--video .fotorama__img,
 .fotorama__wrap--video .fotorama__stage__frame--video .fotorama__html {
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  -webkit-filter: alpha(opacity=0);
   filter: alpha(opacity=0);
   opacity: 0;
 }
 
 .fotorama__img {
+  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  filter: alpha(opacity=0);
+  opacity: 0;
   border: 0;
-  overflow: hidden;
+}
+
+.fotorama__loaded .fotorama__img,
+.fotorama__error .fotorama__img {
+  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+  filter: alpha(opacity=100);
+  opacity: 1;
 }
 
 .fotorama__img--full {
@@ -436,7 +428,7 @@
   border-style: solid;
   border-color: #00afea;
   background-image: -webkit-linear-gradient(top left, rgba(255, 255, 255, 0.25), rgba(64, 64, 64, 0.1));
-  background-image: linear-gradient(top left, rgba(255, 255, 255, 0.25), rgba(64, 64, 64, 0.1));
+  background-image: linear-gradient(to bottom right, rgba(255, 255, 255, 0.25), rgba(64, 64, 64, 0.1));
 }
 
 .fotorama__caption {
@@ -541,6 +533,12 @@
   z-index: 10;
 }
 
+@-moz-document url-prefix()  {
+  .fotorama__active {
+    box-shadow: 0 0 0 transparent;
+  }
+}
+
 .fotorama__arr,
 .fotorama__fullscreen-icon,
 .fotorama__video-play,
@@ -554,7 +552,6 @@
 .fotorama__video-play,
 .fotorama__video-close {
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  -webkit-filter: alpha(opacity=0);
   filter: alpha(opacity=0);
   opacity: 0;
 }
@@ -596,7 +593,6 @@
   pointer-events: none;
   cursor: default;
   *display: none;
-  -webkit-filter: alpha(opacity=0);
   filter: alpha(opacity=0);
   opacity: .1;
 }
@@ -633,7 +629,6 @@
   margin-top: -16px;
   background-position: -64px -32px;
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important;
-  -webkit-filter: alpha(opacity=100) !important;
   filter: alpha(opacity=100) !important;
   opacity: 1 !important;
 }
@@ -650,7 +645,6 @@
 .fotorama__loaded .fotorama__video-play,
 .fotorama__error .fotorama__video-play {
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-  -webkit-filter: alpha(opacity=100);
   filter: alpha(opacity=100);
   opacity: 1;
   z-index: 11;
@@ -661,7 +655,6 @@
 .fotorama__wrap--video .fotorama__arr,
 .fotorama__wrap--video .fotorama__fullscreen-icon {
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)" !important;
-  -webkit-filter: alpha(opacity=0) !important;
   filter: alpha(opacity=0) !important;
   opacity: 0 !important;
 }
@@ -684,7 +677,6 @@
 
 .fotorama__wrap--video .fotorama__stage .fotorama__video-play {
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)" !important;
-  -webkit-filter: alpha(opacity=0) !important;
   filter: alpha(opacity=0) !important;
   opacity: 0 !important;
   z-index: -1;
@@ -694,7 +686,6 @@
   top: 0;
   right: 0;
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-  -webkit-filter: alpha(opacity=100);
   filter: alpha(opacity=100);
   opacity: 1;
 }
@@ -730,7 +721,7 @@
 .fotorama__stage:before,
 .fotorama__nav:before {
   background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.2) 25%, rgba(0, 0, 0, 0.3) 75%, transparent), -webkit-radial-gradient(0 50%, farthest-side, rgba(0, 0, 0, 0.4), transparent);
-  background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.2) 25%, rgba(0, 0, 0, 0.3) 75%, transparent), radial-gradient(0 50%, farthest-side, rgba(0, 0, 0, 0.4), transparent);
+  background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.2) 25%, rgba(0, 0, 0, 0.3) 75%, transparent), radial-gradient(farthest-side at 0 50%, rgba(0, 0, 0, 0.4), transparent);
   background-position: 0 0, 0 0;
   left: -10px;
 }
@@ -743,7 +734,7 @@
 .fotorama__stage:after,
 .fotorama__nav:after {
   background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.2) 25%, rgba(0, 0, 0, 0.3) 75%, transparent), -webkit-radial-gradient(100% 50%, farthest-side, rgba(0, 0, 0, 0.4), transparent);
-  background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.2) 25%, rgba(0, 0, 0, 0.3) 75%, transparent), radial-gradient(100% 50%, farthest-side, rgba(0, 0, 0, 0.4), transparent);
+  background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.2) 25%, rgba(0, 0, 0, 0.3) 75%, transparent), radial-gradient(farthest-side at 100% 50%, rgba(0, 0, 0, 0.4), transparent);
   background-position: 100% 0, 100% 0;
   right: -10px;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fotoramajs
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.3.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-09 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: -3717274209991928291
+      hash: 4017034132781727142
 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: -3717274209991928291
+      hash: 4017034132781727142
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23