fotoramajs 4.6.0 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b0207c19b7c301a3da409bb7c89feb4f8c6fdff
-  data.tar.gz: 82d0f887b3963ebd1d757271b44303311e6a6124
+  metadata.gz: 51c6e27bd919bc52488eb9cbe1cc82d759379c3f
+  data.tar.gz: 7abf54e71c6f7f59cac21cc1f6ab5af0437d5145
 SHA512:
-  metadata.gz: 39446b490a9a15d3708cd1c9647336918ab11057f2b56a7f3c63669792136e22a48caa6b797b95959a0a7bc3cb4bc80a0ad34b48688121af24023954ca491ddc
-  data.tar.gz: 2d954bb8f1aa80e594e9eabea0d4d1b32585f199fc73c066f14255968ca5698ede8437594ca5411b506260fd6bfd860df8fac58a942764cf773d12c296872415
+  metadata.gz: fb07214cb1485ff0a0094c6502fdd6b967d5b92c2e9f3aa34a47eb00adc8ffd921790cdb536c367385ca2724e7ea39defec75ce30826b857b459b7ff10a6afba
+  data.tar.gz: b7d72866ffd1de13ec1b541a7423abacdebde6e24abd29c5be6d1320f63d861cdfc4f491d3bc850eeb3f6b061e33279c1e2961d8b7fc97778c8868c4a3115ea5

data/lib/fotoramajs/version.rb

@@ -1,3 +1,3 @@
 module Fotoramajs
-  VERSION = "4.6.0"
+  VERSION = "4.6.2"
 end

data/vendor/assets/javascripts/fotorama.js

@@ -1,7 +1,7 @@
 /*!
- * Fotorama 4.6.0 | http://fotorama.io/license/
+ * Fotorama 4.6.2 | http://fotorama.io/license/
  */
-fotoramaVersion = '4.6.0';
+fotoramaVersion = '4.6.2';
 (function (window, document, location, $, undefined) {
   "use strict";
 var _fotoramaClass = 'fotorama',
@@ -929,6 +929,8 @@ var $WINDOW = $(window),
       swipe: true,
       trackpad: false,
 
+      enableifsingleframe: false,
+
       controlsonstart: true,
 
       shuffle: false,
@@ -980,9 +982,12 @@ function getDuration (time) {
   return {'transition-duration': time + 'ms'};
 }
 
+function unlessNaN (value, alternative) {
+  return isNaN(value) ? alternative : value;
+}
+
 function numberFromMeasure (value, measure) {
-  value = +String(value).replace(measure || 'px', '');
-  return isNaN(value) ? undefined : value;
+  return unlessNaN(+String(value).replace(measure || 'px', ''));
 }
 
 function numberFromPercent (value) {
@@ -990,7 +995,7 @@ function numberFromPercent (value) {
 }
 
 function numberFromWhatever (value, whole) {
-  return numberFromPercent(value) / 100 * whole || numberFromMeasure(value);
+  return unlessNaN(numberFromPercent(value) / 100 * whole, numberFromMeasure(value));
 }
 
 function measureIsValid (value) {
@@ -1237,16 +1242,33 @@ function isDetached (el) {
   return !$.contains(document.documentElement, el);
 }
 
-function waitFor (test, fn, timeout) {
+function waitFor (test, fn, timeout, i) {
+  if (!waitFor.i) {
+    waitFor.i = 1;
+    waitFor.ii = [true];
+  }
+
+  i = i || waitFor.i;
+
+  if (typeof waitFor.ii[i] === 'undefined') {
+    waitFor.ii[i] = true;
+  }
+
   if (test()) {
     fn();
   } else {
-    setTimeout(function () {
-      waitFor(test, fn);
+    waitFor.ii[i] && setTimeout(function () {
+      waitFor.ii[i] && waitFor(test, fn, timeout, i);
     }, timeout || 100);
   }
+
+  return waitFor.i++;
 }
 
+waitFor.stop = function (i) {
+  waitFor.ii[i] = false;
+};
+
 function setHash (hash) {
   //////console.time('setHash ' + hash);
   location.replace(location.protocol
@@ -1270,6 +1292,9 @@ function fit ($el, measuresToFit, method, position) {
       elData.l.h !== measuresToFit.h ||
       elData.l.m !== method ||
       elData.l.p !== position)) {
+
+    //console.log('fit');
+
     var width = measures.width,
         height = measures.height,
         ratio = measuresToFit.w / measuresToFit.h,
@@ -1966,6 +1991,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
       lastActiveIndex,
       prevIndex,
       nextIndex,
+      nextAutoplayIndex,
       startIndex,
 
       o_loop,
@@ -2141,7 +2167,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
   }
 
   function stageNoMove () {
-    var _noMove = size < 2 || $videoPlaying;
+    var _noMove = (size < 2 && !opts.enableifsingleframe) || $videoPlaying;
     stageShaftTouchTail.noMove = _noMove || o_fade;
     stageShaftTouchTail.noSwipe = _noMove || !opts.swipe;
 
@@ -2176,16 +2202,16 @@ jQuery.Fotorama = function ($fotorama, opts) {
       classes[FLAG ? 'add' : 'remove'].push(value);
     }
 
-    //if (size > 1) { // TODO: need special option for that (disableIfSinglePhoto, типа)
+    if (size > 1 || opts.enableifsingleframe) {
       o_nav = opts.nav;
       o_navTop = opts.navposition === 'top';
       classes.remove.push(selectClass);
 
       $arrs.toggle(!!opts.arrows);
-//    } else {
-//      o_nav = false;
-//      $arrs.hide();
-//    }
+    } else {
+      o_nav = false;
+      $arrs.hide();
+    }
 
     spinnerStop();
     spinner = new Spinner($.extend(spinnerDefaults, opts.spinner, spinnerOverride, {direction: o_rtl ? -1 : 1}));
@@ -2822,7 +2848,6 @@ jQuery.Fotorama = function ($fotorama, opts) {
   }
 
   function onTouchEnd () {
-    //////console.time('onTouchEnd');
     if (!opts.stopautoplayontouch) {
       releaseAutoplay();
       changeAutoplay();
@@ -2839,7 +2864,11 @@ jQuery.Fotorama = function ($fotorama, opts) {
   }
 
   function changeAutoplay () {
+    ////console.log('changeAutoplay');
+
     clearTimeout(changeAutoplay.t);
+    waitFor.stop(changeAutoplay.w);
+
     if (!opts.autoplay || pausedAutoplayFLAG) {
       if (that.autoplay) {
         that.autoplay = false;
@@ -2849,6 +2878,8 @@ jQuery.Fotorama = function ($fotorama, opts) {
       return;
     }
 
+    ////console.log('changeAutoplay continue');
+
     if (!that.autoplay) {
       that.autoplay = true;
       triggerEvent('startautoplay');
@@ -2858,12 +2889,25 @@ jQuery.Fotorama = function ($fotorama, opts) {
 
 
     var frameData = activeFrame[STAGE_FRAME_KEY].data();
-    waitFor(function () {
+    changeAutoplay.w = waitFor(function () {
+      ////console.log('wait for the state of the current frame');
       return frameData.state || _activeIndex !== activeIndex;
     }, function () {
+      ////console.log('the current frame is ready');
       changeAutoplay.t = setTimeout(function () {
+        ////console.log('changeAutoplay.t setTimeout', pausedAutoplayFLAG, _activeIndex !== activeIndex);
         if (pausedAutoplayFLAG || _activeIndex !== activeIndex) return;
-        that.show(o_loop ? getDirectionSign(!o_rtl) : normalizeIndex(activeIndex + (o_rtl ? -1 : 1)));
+
+        var _nextAutoplayIndex = nextAutoplayIndex,
+            nextFrameData = data[_nextAutoplayIndex][STAGE_FRAME_KEY].data();
+
+        changeAutoplay.w = waitFor(function () {
+          ////console.log('wait for the state of the next frame');
+          return nextFrameData.state || _nextAutoplayIndex !== nextAutoplayIndex;
+        }, function () {
+          if (pausedAutoplayFLAG || _nextAutoplayIndex !== nextAutoplayIndex) return;
+          that.show(o_loop ? getDirectionSign(!o_rtl) : nextAutoplayIndex);
+        });
       }, opts.autoplay);
     });
 
@@ -2905,6 +2949,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
     that.activeIndex = activeIndex = edgeIndex(index);
     prevIndex = getPrevIndex(activeIndex);
     nextIndex = getNextIndex(activeIndex);
+    nextAutoplayIndex = normalizeIndex(activeIndex + (o_rtl ? -1 : 1));
     activeIndexes = [activeIndex, prevIndex, nextIndex];
 
     dirtyIndex = o_loop ? index : activeIndex;

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

@@ -1,5 +1,5 @@
 /*!
- * Fotorama 4.6.0 | http://fotorama.io/license/
+ * Fotorama 4.6.2 | http://fotorama.io/license/
  */
 .fotorama__nav__frame:focus .fotorama__dot:after, .fotorama__nav__frame:focus .fotorama__thumb:after, .fotorama__fullscreen-icon:focus:after,
 .fotorama__arr:focus:after, .fotorama__stage__shaft, .fotorama__stage__frame, .fotorama__img, .fotorama__html, .fotorama__video iframe {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fotoramajs
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.2
 platform: ruby
 authors:
 - Artem Polikarpov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets