fotoramajs 4.4.7 → 4.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 888bdc17c3f4261ac1b4a447e43a9de92eab4f01
-  data.tar.gz: 085d95b6aa7e99c7a947dbc502fe5d441b93c85d
+  metadata.gz: 67d438259c7e801ec727ac663d8daee2d0f9354e
+  data.tar.gz: e53d3c6fcf173380ccf855b98482fdf2a5cca8f6
 SHA512:
-  metadata.gz: ac505aadf7e0f94ea4cdf187e523eb32d62482c77882c05ef28696e06b25820fe4eacb62c48ee61c574aaebe3f4006b652c1ba2801ed0b7347f0007cb818ace1
-  data.tar.gz: 2cf48602c09c5c751c347fb3cd4e310266ed859286a97516452fe2f1c2e0d448966913118020f94966e0c10049315b2daae377508e3e7c1a703748e63989f1ff
+  metadata.gz: 5ef51eae85f58f5bb76accdfe7810d2ee5aa502f982934ccd65a1b9befb185af974001bbac8b7d975dc11f89dbf4f4fdb266c169c73ecc1a94567976d1aaa459
+  data.tar.gz: 736fc744dc6fa65063f0a2ec72c9022de6c56b84b1fa44c7cdd69ac835a1ad105553e8c33862ae2e7c083d57b0ab5680099bf3fe3d0a956b7b0575d53aac17d4

data/lib/fotoramajs/version.rb

@@ -1,3 +1,3 @@
 module Fotoramajs
-  VERSION = "4.4.7"
+  VERSION = "4.4.8"
 end

data/vendor/assets/javascripts/fotorama.js

@@ -1,5 +1,5 @@
 /*!
- * Fotorama 4.4.7 | http://fotorama.io/license/
+ * Fotorama 4.4.8 | http://fotorama.io/license/
  */
 (function (window, document, location, $, undefined) {
   "use strict";
@@ -427,6 +427,11 @@ var Spinner,
       rotate: 15, // The rotation offset
       color: 'rgba(128, 128, 128, .75)',
       hwaccel: true
+    },
+    spinnerOverride = {
+      top: 'auto',
+      left: 'auto',
+      className: ''
     };
 
 (function(root, factory) {
@@ -1262,12 +1267,12 @@ function smartClick ($el, fn, _options) {
         (_options.onStart || noop).call(this, e);
       },
       onMove: _options.onMove || noop,
+      onTouchEnd: _options.onTouchEnd || noop,
       onEnd: function (result) {
         if (result.moved || _options.tail.checked) return;
         fn.call(this, startEvent);
       }
     }), _options.tail);
-
   });
 }
 
@@ -1461,6 +1466,7 @@ function touch ($el, options) {
         || moveEventType !== e.type
         || !touchEnabledFLAG) {
       touchEnabledFLAG && onEnd();
+      (options.onTouchEnd || noop)();
       return;
     }
 
@@ -1487,6 +1493,9 @@ function touch ($el, options) {
 
   function onEnd (e) {
     ////console.time('touch.js onEnd');
+
+    (options.onTouchEnd || noop)();
+
     var _touchEnabledFLAG = touchEnabledFLAG;
     tail.control = touchEnabledFLAG = false;
 
@@ -1710,6 +1719,7 @@ function moveOnTouch ($el, options) {
   tail = $.extend(touch(options.$wrap, {
     onStart: onStart,
     onMove: onMove,
+    onTouchEnd: options.onTouchEnd,
     onEnd: onEnd,
     select: options.select,
     control: options.control
@@ -1871,8 +1881,6 @@ jQuery.Fotorama = function ($fotorama, opts) {
   toDeactivate[NAV_DOT_FRAME_KEY] = [];
   toDetach[STAGE_FRAME_KEY] = {};
 
-  that.prevent = {};
-
   $wrap.addClass(CSS3 ? wrapCss3Class : wrapCss2Class);
 
   fotoramaData.fotorama = this;
@@ -2021,7 +2029,8 @@ jQuery.Fotorama = function ($fotorama, opts) {
       $arrs.hide();
     }
 
-    spinner = new Spinner($.extend(spinnerDefaults, opts.spinner));
+    spinnerStop();
+    spinner = new Spinner($.extend(spinnerDefaults, opts.spinner, spinnerOverride, {direction: o_rtl ? -1 : 1}));
 
     arrsUpdate();
     stageWheelUpdate();
@@ -2092,8 +2101,6 @@ jQuery.Fotorama = function ($fotorama, opts) {
     o_shadows = opts.shadows && !SLOW;
     classes[addOrRemove(!o_shadows)].push(wrapNoShadowsClass);
 
-    spinnerStop();
-
     $wrap
         .addClass(classes.add.join(' '))
         .removeClass(classes.remove.join(' '));
@@ -2222,7 +2229,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
 
           frameData.state = 'error';
 
-          if (size > 1 && !dataFrame.html && !dataFrame.deleted && !dataFrame.video && !fullFLAG) {
+          if (size > 1 && data[index] === dataFrame && !dataFrame.html && !dataFrame.deleted && !dataFrame.video && !fullFLAG) {
             dataFrame.deleted = true;
             that.splice(index, 1);
           }
@@ -2307,7 +2314,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
 
   function spinnerStop () {
     $spinner.detach();
-    spinner.stop();
+    spinner && spinner.stop();
   }
 
   function updateFotoramaState () {
@@ -2606,13 +2613,8 @@ jQuery.Fotorama = function ($fotorama, opts) {
     });
   }
 
-  function triggerEvent (event, extra, fn) {
+  function triggerEvent (event, extra) {
     $fotorama.trigger(_fotoramaClass + ':' + event, [that, extra]);
-    if (!that.prevent[event]) {
-      (fn || noop)();
-    } else {
-     delete that.prevent[event];
-    }
   }
 
   function onTouchStart () {
@@ -3077,13 +3079,11 @@ jQuery.Fotorama = function ($fotorama, opts) {
     } else if ($videoPlaying) {
       target === videoClose && unloadVideo($videoPlaying, true, true);
     } else {
-      triggerEvent('stagetap', undefined, function () {
-        if (toggleControlsFLAG) {
-          toggleControlsClass();
-        } else if (opts.click) {
-          that.show({index: e.shiftKey || getDirectionSign(getDirection(e._x)), slow: e.altKey, user: true});
-        }
-      });
+      if (toggleControlsFLAG) {
+        toggleControlsClass();
+      } else if (opts.click) {
+        that.show({index: e.shiftKey || getDirectionSign(getDirection(e._x)), slow: e.altKey, user: true});
+      }
     }
     ////console.timeEnd('onStageTap');
   }
@@ -3097,12 +3097,11 @@ jQuery.Fotorama = function ($fotorama, opts) {
     onMove: function (e, result) {
       setShadow($stage, result.edge);
     },
+    onTouchEnd: onTouchEnd,
     onEnd: function (result) {
       ////console.time('stageShaftTouchTail.onEnd');
       setShadow($stage);
 
-      onTouchEnd();
-
       var toggleControlsFLAG = (MS_POINTER && !hoverFLAG || result.touch) && opts.arrows;
 
       if (result.moved || (toggleControlsFLAG && result.pos !== result.newPos)) {
@@ -3134,9 +3133,8 @@ jQuery.Fotorama = function ($fotorama, opts) {
     onMove: function (e, result) {
       setShadow($nav, result.edge);
     },
+    onTouchEnd: onTouchEnd,
     onEnd: function (result) {
-      onTouchEnd();
-
       function onEnd () {
         slideNavShaft.l = result.newPos;
         releaseAutoplay();
@@ -3214,17 +3212,13 @@ jQuery.Fotorama = function ($fotorama, opts) {
 
   smartClick($arrs, function (e) {
     stopEvent(e);
-    if ($videoPlaying) {
-      unloadVideo($videoPlaying, true, true);
-    } else {
-      onTouchEnd();
-      that.show({index: $arrs.index(this) ? '>' : '<', slow: e.altKey, user: true});
-    }
+    that.show({index: $arrs.index(this) ? '>' : '<', slow: e.altKey, user: true});
   }, {
     onStart: function () {
       onTouchStart();
       stageShaftTouchTail.control = true;
     },
+    onTouchEnd: onTouchEnd,
     tail: stageShaftTouchTail
   });
 
@@ -3366,7 +3360,8 @@ $.fn.fotorama = function (opts) {
 
                   direction: 'ltr', // 'rtl'
 
-                  shadows: true
+                  shadows: true,
+                  spinner: null
                 },
                 window.fotoramaDefaults,
                 opts,

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

@@ -1,5 +1,5 @@
 /*!
- * Fotorama 4.4.7 | http://fotorama.io/license/
+ * Fotorama 4.4.8 | http://fotorama.io/license/
  */
 .fotorama__stage__shaft,
 .fotorama__stage__frame,
@@ -71,10 +71,11 @@
   transform: translate3d(0, 0, 0);
 }
 
+.fotorama__wrap--css3 .fotorama__spinner,
 .fotorama__wrap--css3 .fotorama__stage,
 .fotorama__wrap--css3 .fotorama__nav,
 .fotorama__wrap--css3 .fotorama__stage__frame,
-.fotorama__wrap--css3 .fotorama__stage__frame .fotorama__img,
+.fotorama__wrap--css3 .fotorama__stage .fotorama__img,
 .fotorama__wrap--css3 .fotorama__html,
 .fotorama__wrap--css3 .fotorama__caption,
 .fotorama__stage:before,
@@ -471,6 +472,37 @@
   padding: 5px 10px;
 }
 
+@-webkit-keyframes spinner {
+  0% {
+    -webkit-transform: rotate(0);
+    transform: rotate(0);
+  }
+
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+
+@keyframes spinner {
+  0% {
+    -webkit-transform: rotate(0);
+    -ms-transform: rotate(0);
+    transform: rotate(0);
+  }
+
+  100% {
+    -webkit-transform: rotate(360deg);
+    -ms-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+
+.fotorama__wrap--css3 .fotorama__spinner {
+  -webkit-animation: spinner 24s infinite linear;
+  animation: spinner 24s infinite linear;
+}
+
 .fotorama__wrap--css3 .fotorama__stage .fotorama__img,
 .fotorama__wrap--css3 .fotorama__html,
 .fotorama__wrap--css3 .fotorama__caption {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fotoramajs
 version: !ruby/object:Gem::Version
-  version: 4.4.7
+  version: 4.4.8
 platform: ruby
 authors:
 - Artem Polikarpov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets