fotoramajs 4.4.4 → 4.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10501d0dcdfbc278510b491b80b068df64b40398
-  data.tar.gz: b0873b719de2577141f853bb2aee76372f88700a
+  metadata.gz: f56a4a09e7d03468fe08f76f5e87c80e709ccfd5
+  data.tar.gz: 1354434441490a5dfe5ae5f8b59db8aa08be3349
 SHA512:
-  metadata.gz: bd16db98370862b73ce1e5a1a06654f4a3c8467b35818f133d86f890a1d1a7fd13f6d9a868016b5f5ef64d5202c5d4a59bdd5631f9b5c2c0cd8c151138b1eb33
-  data.tar.gz: bdde8302a6132c46fcffd08f082aa417d4b5057e31ea17a05980ce1bb0be7497f5c44f5bf6da960f6f5e608cafea2b52f30be5d996d7d529d9461c9ba89596de
+  metadata.gz: b3117fb71a09d6a0355877eb753a3e6d1a80a5dcb8084e34642e72c504a3e763dc2668d20135e411f15948982eed9d567ce8ab1ca4aceced09df12d3b8656ff9
+  data.tar.gz: 29cec6cb0b8cb562d00f5cc670d613f4076125c13ae668133464c737bcc62a06fa7741d2061249f0a3534fc4bd9e8a868105489188c2adfd0fd9db527eb617d2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fotoramajs (4.4.4)
+    fotoramajs (4.4.5)
       sprockets (>= 2)
 
 GEM
@@ -9,7 +9,7 @@ GEM
   specs:
     hike (1.2.3)
     httpclient (2.3.4.1)
-    multi_json (1.8.0)
+    multi_json (1.8.2)
     rack (1.5.2)
     sprockets (2.10.0)
       hike (~> 1.2)

data/lib/fotoramajs/version.rb

@@ -1,3 +1,3 @@
 module Fotoramajs
-  VERSION = "4.4.4"
+  VERSION = "4.4.5"
 end

data/vendor/assets/javascripts/fotorama.js

@@ -1,5 +1,5 @@
 /*!
- * Fotorama 4.4.4 | http://fotorama.io/license/
+ * Fotorama 4.4.5 | http://fotorama.io/license/
  */
 (function (window, document, location, $, undefined) {
   "use strict";
@@ -7,6 +7,7 @@ var _fotoramaClass = 'fotorama',
     _fullscreenClass = 'fullscreen',
 
     wrapClass = _fotoramaClass + '__wrap',
+    wrapCss2Class = wrapClass + '--css2',
     wrapCss3Class = wrapClass + '--css3',
     wrapVideoClass = wrapClass + '--video',
     wrapFadeClass = wrapClass + '--fade',
@@ -79,6 +80,7 @@ var _fotoramaClass = 'fotorama',
     videoCloseClass = videoClass + '-close',
 
     captionClass = _fotoramaClass + '__caption',
+    captionWrapClass = _fotoramaClass + '__caption__wrap',
 
     ooooClass = _fotoramaClass + '__oooo';
 var JQUERY_VERSION = $ && $.fn.jquery.split('.');
@@ -86,7 +88,7 @@ var JQUERY_VERSION = $ && $.fn.jquery.split('.');
 if (!JQUERY_VERSION
     || JQUERY_VERSION[0] < 1
     || (JQUERY_VERSION[0] == 1 && JQUERY_VERSION[1] < 8)) {
-  window.console && console['error']('Fotorama requires jQuery 1.8 or later and will not run without it.');
+  throw new Error('Fotorama requires jQuery 1.8 or later and will not run without it.');
   return;
 }
 // My Underscore :-)
@@ -742,9 +744,7 @@ function getDataFromHtml ($el) {
     $.extend(imgData, {
       width: width,
       height: height,
-      thumbratio: getRatio(imgData.thumbratio
-          || (numberFromMeasure(imgData.thumbwidth || ($child && $child.attr('width')) || separateThumbFLAG || width)
-              / numberFromMeasure(imgData.thumbheight || ($child && $child.attr('height')) || separateThumbFLAG || height)))
+      thumbratio: getRatio(imgData.thumbratio || (numberFromMeasure(imgData.thumbwidth || ($child && $child.attr('width')) || separateThumbFLAG || width) / numberFromMeasure(imgData.thumbheight || ($child && $child.attr('height')) || separateThumbFLAG || height)))
     });
   }
 
@@ -963,6 +963,7 @@ function stopEvent (e, stopPropagation) {
 function getDirectionSign (forward) {
   return forward ? '>' : '<';
 }
+
 function slide ($el, options) {
   var elPos = Math.round(options.pos),
       onEndFn = options.onEnd || noop;
@@ -1379,8 +1380,6 @@ function wheel ($el, options) {
 
   return tail;
 }
-
-
 jQuery.Fotorama = function ($fotorama, opts) {
   $HTML = $HTML || $('html');
   $BODY = $BODY || $('body');
@@ -1403,8 +1402,8 @@ jQuery.Fotorama = function ($fotorama, opts) {
 
       $stageShaft = $(div(stageShaftClass)).appendTo($stage),
       $stageFrame = $(),
-      $arrPrev = $(div(arrClass + ' ' + arrPrevClass, div(arrArrClass))),
-      $arrNext = $(div(arrClass + ' ' + arrNextClass, div(arrArrClass))),
+      $arrPrev = $(div(arrClass + ' ' + arrPrevClass/*, div(arrArrClass)*/)),
+      $arrNext = $(div(arrClass + ' ' + arrNextClass/*, div(arrArrClass)*/)),
       $arrs = $arrPrev.add($arrNext).appendTo($stage),
       $navWrap = $(div(navWrapClass)),
       $nav = $(div(navClass)).appendTo($navWrap),
@@ -1490,9 +1489,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
 
   that.prevent = {};
 
-  if (CSS3) {
-    $wrap.addClass(wrapCss3Class);
-  }
+  $wrap.addClass(CSS3 ? wrapCss3Class : wrapCss2Class);
 
   fotoramaData.fotorama = this;
 
@@ -1532,10 +1529,10 @@ jQuery.Fotorama = function ($fotorama, opts) {
                 that.cancelFullScreen();
               } else if (e.keyCode === 39 || (e.keyCode === 40 && that.fullScreen)) {
                 stopEvent(e);
-                that.show({index: '>', slow: e.altKey, direct: true});
+                that.show({index: '>', slow: e.altKey, user: true});
               } else if (e.keyCode === 37 || (e.keyCode === 38 && that.fullScreen)) {
                 stopEvent(e);
-                that.show({index: '<', slow: e.altKey, direct: true});
+                that.show({index: '<', slow: e.altKey, user: true});
               }
             }
           });
@@ -1976,7 +1973,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
         }
 
         if (opts.captions && dataFrame.caption) {
-          $('<div class="' + captionClass + '"></div>').append(dataFrame.caption).appendTo($frame);
+          $(div(captionClass, div(captionWrapClass, dataFrame.caption))).appendTo($frame);
         }
 
         dataFrame.video && $frame
@@ -2351,7 +2348,10 @@ jQuery.Fotorama = function ($fotorama, opts) {
       frameDraw(activeIndexes, 'stage');
       stageFramePosition([dirtyIndex, getPrevIndex(dirtyIndex), getNextIndex(dirtyIndex)]);
       updateTouchTails('go', true);
-      triggerEvent('show', options.direct);
+      triggerEvent('show', {
+        user: options.user,
+        time: time
+      });
     //}, 0);
 
     var onEnd = that.show.onEnd = function (skipReposition) {
@@ -2362,7 +2362,9 @@ jQuery.Fotorama = function ($fotorama, opts) {
 
       skipReposition || stageShaftReposition(true);
 
-      triggerEvent('showend', options.direct);
+      triggerEvent('showend', {
+        user: options.user
+      });
 
       updateTouchTails('go', false);
       stageWheelUpdate();
@@ -2513,9 +2515,10 @@ jQuery.Fotorama = function ($fotorama, opts) {
       if (opts.glimpse) {
         // 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});
       }
 
+      $stageShaft.css({width: measures.w, marginLeft: (measures.W - measures.w) / 2});
+
       //console.log('measures.W', measures.W);
       //console.log('measures.w', measures.w);
 
@@ -2673,7 +2676,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
         if (toggleControlsFLAG) {
           toggleControlsClass();
         } else if (opts.click) {
-          that.show({index: e.shiftKey || getDirectionSign(getDirection(e._x)), slow: e.altKey, direct: true});
+          that.show({index: e.shiftKey || getDirectionSign(getDirection(e._x)), slow: e.altKey, user: true});
         }
       });
     }
@@ -2701,7 +2704,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
           index: index,
           time: o_fade ? o_transitionDuration : result.time,
           overPos: result.overPos,
-          direct: true
+          user: true
         });
       } else if (!result.aborted) {
         onStageTap(result.startEvent, toggleControlsFLAG);
@@ -2798,7 +2801,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
 
   function onNavFrameClick (e, time) {
     var index = $(this).data().eq;
-    that.show({index: index, slow: e.altKey, direct: true, coo: e._x - $nav.offset().left, time: time});
+    that.show({index: index, slow: e.altKey, user: true, coo: e._x - $nav.offset().left, time: time});
   }
 
   smartClick($arrs, function (e) {
@@ -2807,7 +2810,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
       unloadVideo($videoPlaying, true, true);
     } else {
       onTouchEnd();
-      that.show({index: $arrs.index(this) ? '>' : '<', slow: e.altKey, direct: true});
+      that.show({index: $arrs.index(this) ? '>' : '<', slow: e.altKey, user: true});
     }
   }, {
     onStart: function () {
@@ -2868,7 +2871,7 @@ jQuery.Fotorama = function ($fotorama, opts) {
       if (method !== 'load') {
         Array.prototype[method].apply(data, arguments);
       } else if (arguments[0] && typeof arguments[0] === 'object' && arguments[0].length) {
-        data = arguments[0];
+        data = clone(arguments[0]);
       }
       reset();
       return that;

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

@@ -1,5 +1,5 @@
 /*!
- * Fotorama 4.4.4 | http://fotorama.io/license/
+ * Fotorama 4.4.5 | http://fotorama.io/license/
  */
 .fotorama__stage__shaft,
 .fotorama__stage__frame,
@@ -59,11 +59,6 @@
 .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,
 .fotorama__arr,
 .fotorama__fullscreen-icon,
 .fotorama__video-play,
@@ -73,6 +68,21 @@
   transform: translate3d(0, 0, 0);
 }
 
+.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__html,
+.fotorama__wrap--css3 .fotorama__caption,
+.fotorama__stage:before,
+.fotorama__stage:after,
+.fotorama__nav:before,
+.fotorama__nav:after {
+  -webkit-transform: translateZ(0);
+  -ms-transform: translateZ(0);
+  transform: translateZ(0);
+}
+
 .fotorama__wrap--video .fotorama__stage__shaft,
 .fotorama__wrap--video .fotorama__stage__frame--video {
   -webkit-transform: none !important;
@@ -83,8 +93,8 @@
 .fotorama__wrap--css3 .fotorama__stage__shaft,
 .fotorama__wrap--css3 .fotorama__nav__shaft,
 .fotorama__wrap--css3 .fotorama__thumb-border {
-  -webkit-transition-property: -webkit-transform, width;
-  transition-property: transform, width;
+  -webkit-transition-property: -webkit-transform;
+  transition-property: transform;
   -webkit-transition-timing-function: cubic-bezier(0.1, 0, 0.25, 1);
   transition-timing-function: cubic-bezier(0.1, 0, 0.25, 1);
   -webkit-transition-duration: 0ms;
@@ -117,7 +127,8 @@
 }
 
 .fotorama__nav__shaft,
-.fotorama__nav__frame {
+.fotorama__nav__frame,
+.fotorama__caption__wrap {
   display: -moz-inline-box;
   -moz-box-orient: vertical;
   display: inline-block;
@@ -131,7 +142,7 @@
   box-sizing: content-box;
 }
 
-.fotorama__caption {
+.fotorama__caption__wrap {
   -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
@@ -156,7 +167,7 @@
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
-.fotorama__arr__arr,
+.fotorama__arr,
 .fotorama__fullscreen-icon,
 .fotorama__video-play,
 .fotorama__video-close {
@@ -164,7 +175,7 @@
 }
 
 @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
-  .fotorama__arr__arr,
+  .fotorama__arr,
   .fotorama__fullscreen-icon,
   .fotorama__video-play,
   .fotorama__video-close {
@@ -436,14 +447,11 @@
   z-index: 12;
   bottom: 0;
   left: 0;
-  max-width: 100%;
+  right: 0;
   font-family: 'Helvetica Neue', Arial, sans-serif;
   font-size: 14px;
   line-height: 1.5;
   color: #000;
-  background-color: #fff;
-  background-color: rgba(255, 255, 255, 0.9);
-  padding: 5px 10px;
 }
 
 .fotorama__caption a {
@@ -467,6 +475,12 @@
   right: 0;
 }
 
+.fotorama__caption__wrap {
+  background-color: #fff;
+  background-color: rgba(255, 255, 255, 0.9);
+  padding: 5px 10px;
+}
+
 .fotorama__oooo {
   width: 6px;
   height: 6px;
@@ -504,7 +518,6 @@
 
 .fotorama__wrap--css3 .fotorama__img,
 .fotorama__wrap--css3 .fotorama__html,
-.fotorama__wrap--css3.fotorama__wrap--fade .fotorama__stage__frame,
 .fotorama__wrap--css3 .fotorama__caption {
   -webkit-transition-property: opacity;
   transition-property: opacity;
@@ -545,43 +558,21 @@
   cursor: pointer;
 }
 
-.fotorama__video-play,
-.fotorama__video-close {
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: alpha(opacity=0);
-  opacity: 0;
-}
-
 .fotorama__arr {
-  width: 48px;
-  height: 100%;
-  top: 0;
-  bottom: 0;
-}
-
-.fotorama__arr__arr {
   position: absolute;
   width: 32px;
   height: 32px;
-  left: 50%;
   top: 50%;
-  margin-left: -16px;
   margin-top: -16px;
 }
 
 .fotorama__arr--prev {
   left: 0;
-}
-
-.fotorama__arr--prev .fotorama__arr__arr {
   background-position: 0 0;
 }
 
 .fotorama__arr--next {
   right: 0;
-}
-
-.fotorama__arr--next .fotorama__arr__arr {
   background-position: -32px 0;
 }
 
@@ -589,7 +580,6 @@
   pointer-events: none;
   cursor: default;
   *display: none;
-  filter: alpha(opacity=0);
   opacity: .1;
 }
 
@@ -614,84 +604,107 @@
   margin-left: -48px;
   margin-top: -48px;
   background-position: 0 -64px;
+  display: none;
+}
+
+.fotorama__wrap--css3 .fotorama__video-play {
+  display: block;
+  opacity: 0;
+}
+
+.fotorama__loaded .fotorama__video-play,
+.fotorama__error .fotorama__video-play {
+  display: block;
+  opacity: 1;
 }
 
 .fotorama__nav__frame .fotorama__video-play {
   width: 32px;
   height: 32px;
-  left: 50%;
-  top: 50%;
   margin-left: -16px;
   margin-top: -16px;
   background-position: -64px -32px;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important;
-  filter: alpha(opacity=100) !important;
   opacity: 1 !important;
+  display: block !important;
 }
 
 .fotorama__video-close {
   width: 32px;
   height: 32px;
-  top: -32px;
-  right: -32px;
+  top: 0;
+  right: 0;
+  display: none;
   background-position: -64px 0;
   z-index: 20;
 }
 
-.fotorama__loaded .fotorama__video-play,
-.fotorama__error .fotorama__video-play {
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-  filter: alpha(opacity=100);
-  opacity: 1;
-  z-index: 11;
-}
-
 .fotorama__wrap--no-controls .fotorama__arr,
 .fotorama__wrap--no-controls .fotorama__fullscreen-icon,
 .fotorama__wrap--video .fotorama__arr,
 .fotorama__wrap--video .fotorama__fullscreen-icon {
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)" !important;
-  filter: alpha(opacity=0) !important;
-  opacity: 0 !important;
+  display: none;
+  opacity: 0;
 }
 
-.fotorama__wrap--slide.fotorama__wrap--no-controls .fotorama__fullscreen-icon,
-.fotorama__wrap--video .fotorama__fullscreen-icon {
-  top: -32px;
-  right: -32px;
+.fotorama__wrap--css3.fotorama__wrap--slide.fotorama__wrap--no-controls .fotorama__fullscreen-icon,
+.fotorama__wrap--css3.fotorama__wrap--video .fotorama__fullscreen-icon {
+  display: block;
+  -webkit-transform: translate3d(32px, -32px, 0);
+  -ms-transform: translate3d(32px, -32px, 0);
+  transform: translate3d(32px, -32px, 0);
 }
 
-.fotorama__wrap--slide.fotorama__wrap--no-controls .fotorama__arr--prev,
-.fotorama__wrap--video .fotorama__arr--prev {
-  left: -48px;
+.fotorama__wrap--css3.fotorama__wrap--slide.fotorama__wrap--no-controls .fotorama__arr--prev,
+.fotorama__wrap--css3.fotorama__wrap--video .fotorama__arr--prev {
+  display: block;
+  -webkit-transform: translate3d(-48px, 0, 0);
+  -ms-transform: translate3d(-48px, 0, 0);
+  transform: translate3d(-48px, 0, 0);
 }
 
-.fotorama__wrap--slide.fotorama__wrap--no-controls .fotorama__arr--next,
-.fotorama__wrap--video .fotorama__arr--next {
-  right: -48px;
+.fotorama__wrap--css3.fotorama__wrap--slide.fotorama__wrap--no-controls .fotorama__arr--next,
+.fotorama__wrap--css3.fotorama__wrap--video .fotorama__arr--next {
+  display: block;
+  -webkit-transform: translate3d(48px, 0, 0);
+  -ms-transform: translate3d(48px, 0, 0);
+  transform: translate3d(48px, 0, 0);
 }
 
 .fotorama__wrap--video .fotorama__stage .fotorama__video-play {
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)" !important;
-  filter: alpha(opacity=0) !important;
-  opacity: 0 !important;
-  z-index: -1;
+  display: none;
 }
 
 .fotorama__wrap--video .fotorama__video-close {
-  top: 0;
-  right: 0;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-  filter: alpha(opacity=100);
+  display: block;
+}
+
+.fotorama__wrap--css3 .fotorama__video-close {
+  display: block;
+  opacity: 0;
+  -webkit-transform: translate3d(32px, -32px, 0);
+  -ms-transform: translate3d(32px, -32px, 0);
+  transform: translate3d(32px, -32px, 0);
+}
+
+.fotorama__wrap--css3.fotorama__wrap--video .fotorama__stage .fotorama__video-play {
+  display: block;
+  opacity: 0;
+  z-index: -1;
+}
+
+.fotorama__wrap--css3.fotorama__wrap--video .fotorama__video-close {
   opacity: 1;
+  -webkit-transform: translate3d(0, 0, 0);
+  -ms-transform: translate3d(0, 0, 0);
+  transform: translate3d(0, 0, 0);
 }
 
 .fotorama__wrap--css3 .fotorama__arr,
 .fotorama__wrap--css3 .fotorama__fullscreen-icon,
 .fotorama__wrap--css3 .fotorama__video-play,
 .fotorama__wrap--css3 .fotorama__video-close {
-  -webkit-transition-property: top, right, left, opacity;
-  transition-property: top, right, left, opacity;
+  -webkit-transition-property: -webkit-transform, opacity;
+  transition-property: transform, opacity;
   -webkit-transition-duration: 0.3s;
   transition-duration: 0.3s;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fotoramajs
 version: !ruby/object:Gem::Version
-  version: 4.4.4
+  version: 4.4.5
 platform: ruby
 authors:
 - Artem Polikarpov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets