bxslider-rails 4.2.4 → 4.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5721fb2873fdb30cb74d32487970720006cf203
-  data.tar.gz: e47d256bec47b063a34e0c548269fbf19a352831
+  metadata.gz: 630db28c0df83697c6a0e0e0baaa581eadab28fa
+  data.tar.gz: 2813810f566a64a817a7df72cf0c0b5dd11d0c1f
 SHA512:
-  metadata.gz: d9bc9088ffb39c70dfd6558e5461ed32b62334ea24f8c42e6ccb771aa0a92da5a17b1189ce3de9335264aca14ecdee44d5088ea261b0d62c449e89d8d7b1abef
-  data.tar.gz: 2063d3858c87b1b0b202e7993652928f58823af43851a3211675d805243b5b048e00f953a2fd2492d6d7f04efe588cd087a7c89a69420fade5ce93d16c36faae
+  metadata.gz: e42be24b8ea7abef6cdcccbc9219600d5d1356690f2c6b45fe20a7683e6379e69c15b83655a0ca4fbbd36e37bc621ad0469d778d1e5741698cc4f615f4f047e0
+  data.tar.gz: 0072fdf5f3e74382bc4caa170ee477f7004d08338d43043fd89bb774258cc4ce76ff308584c5bd3618d2e029de5bc5f5616f6b6e28489b99a2c10f7c8ecda067

data/README.md

@@ -1,13 +1,13 @@
-# bxSlider Rails Gem - v4.2.4
+# bxSlider Rails Gem - v4.2.5
 
-jQuery bxSlider v4.2.4 - http://bxslider.com
+jQuery bxSlider v4.2.5 - http://bxslider.com
 
 bxSlider       Author: Steven Wanderski, Copyright 2011
 bxslider-rails Author: Mauricio Natanael Ferreira.
 
 ### Extra info
 
-	bxSlider 4.2.4 == bxslider-rails (4.2.4)
+	bxSlider 4.2.5 == bxslider-rails (4.2.5)
 	
 ## Installation
 

data/lib/bxslider-rails/version.rb

@@ -1,5 +1,5 @@
 module Bxslider
   module Rails
-    VERSION = "4.2.4"
+    VERSION = "4.2.5"
   end
 end

data/vendor/assets/javascripts/jquery.bxslider.js

@@ -1,5 +1,5 @@
 /**
- * bxSlider v4.2.4
+ * bxSlider v4.2.5
  * Copyright 2013-2015 Steven Wanderski
  * Written while drinking Belgian ales and listening to jazz
 
@@ -346,10 +346,9 @@
      * Returns the calculated height of the viewport, used to determine either adaptiveHeight or the maxHeight value
      */
     var getViewportHeight = function() {
-      var height = el.outerHeight(),
-      currentIndex = null,
+      var height = 0;
       // first determine which children (slides) should be used in our height calculation
-      children = $();
+      var children = $();
       // if mode is not "vertical" and adaptiveHeight is false, include all children
       if (slider.settings.mode !== 'vertical' && !slider.settings.adaptiveHeight) {
         children = slider.children;
@@ -360,14 +359,14 @@
         // if carousel, return a slice of children
         } else {
           // get the individual slide index
-          currentIndex = slider.settings.moveSlides === 1 ? slider.active.index : slider.active.index * getMoveBy();
+          var currentIndex = slider.settings.moveSlides === 1 ? slider.active.index : slider.active.index * getMoveBy();
           // add the current slide to the children
           children = slider.children.eq(currentIndex);
           // cycle through the remaining "showing" slides
-          for (var i = 1; i <= slider.settings.maxSlides - 1; i++) {
+          for (i = 1; i <= slider.settings.maxSlides - 1; i++) {
             // if looped back to the start
             if (currentIndex + i >= slider.children.length) {
-              children = children.add(slider.children.eq(currentIndex + i - slider.children.length));
+              children = children.add(slider.children.eq(i - 1));
             } else {
               children = children.add(slider.children.eq(currentIndex + i));
             }
@@ -564,31 +563,39 @@
         if (type === 'slide') {
           // set the property value
           el.css(slider.animProp, propValue);
-          // bind a callback method - executes when CSS transition completes
-          el.bind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd', function(e) {
-            //make sure it's the correct one
-            if (!$(e.target).is(el)) { return; }
-            // unbind the callback
-            el.unbind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd');
+          if (duration !== 0) {
+            // bind a callback method - executes when CSS transition completes
+            el.bind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd', function(e) {
+              //make sure it's the correct one
+              if (!$(e.target).is(el)) { return; }
+              // unbind the callback
+              el.unbind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd');
+              updateAfterSlideTransition();
+            });
+          } else { //duration = 0
             updateAfterSlideTransition();
-          });
+          }
         } else if (type === 'reset') {
           el.css(slider.animProp, propValue);
         } else if (type === 'ticker') {
           // make the transition use 'linear'
           el.css('-' + slider.cssPrefix + '-transition-timing-function', 'linear');
           el.css(slider.animProp, propValue);
-          // bind a callback method - executes when CSS transition completes
-          el.bind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd', function(e) {
-            //make sure it's the correct one
-            if (!$(e.target).is(el)) { return; }
-            // unbind the callback
-            el.unbind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd');
-            // reset the position
+          if (duration !== 0) {
+            el.bind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd', function(e) {
+              //make sure it's the correct one
+              if (!$(e.target).is(el)) { return; }
+              // unbind the callback
+              el.unbind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd');
+              // reset the position
+              setPositionProperty(params.resetValue, 'reset', 0);
+              // start the loop again
+              tickerLoop();
+            });
+          } else { //duration = 0
             setPositionProperty(params.resetValue, 'reset', 0);
-            // start the loop again
             tickerLoop();
-          });
+          }
         }
       // use JS animate
       } else {
@@ -1281,6 +1288,34 @@
       }
     };
 
+    /**
+     * Returns index according to present page range
+     *
+     * @param slideOndex (int)
+     *  - the desired slide index
+     */
+    var setSlideIndex = function(slideIndex) {
+      if (slideIndex < 0) {
+        if (slider.settings.infiniteLoop) {
+          return getPagerQty() - 1;
+        }else {
+          //we don't go to undefined slides
+          return slider.active.index;
+        }
+      // if slideIndex is greater than children length, set active index to 0 (this happens during infinite loop)
+      } else if (slideIndex >= getPagerQty()) {
+        if (slider.settings.infiniteLoop) {
+          return 0;
+        } else {
+          //we don't move to undefined pages
+          return slider.active.index;
+        }
+      // set active index to requested slide
+      } else {
+        return slideIndex;
+      }
+    };
+
     /**
      * ===================================================================================
      * = PUBLIC FUNCTIONS
@@ -1304,31 +1339,25 @@
       position = {left: 0, top: 0},
       lastChild = null,
       lastShowingIndex, eq, value, requestEl;
+      // store the old index
+      slider.oldIndex = slider.active.index;
+      //set new index
+      slider.active.index = setSlideIndex(slideIndex);
 
       // if plugin is currently in motion, ignore request
-      if (slider.working || slider.active.index === slideIndex) { return; }
+      if (slider.working || slider.active.index === slider.oldIndex) { return; }
       // declare that plugin is in motion
       slider.working = true;
-      // store the old index
-      slider.oldIndex = slider.active.index;
-      // if slideIndex is less than zero, set active index to last child (this happens during infinite loop)
-      if (slideIndex < 0) {
-        slider.active.index = getPagerQty() - 1;
-      // if slideIndex is greater than children length, set active index to 0 (this happens during infinite loop)
-      } else if (slideIndex >= getPagerQty()) {
-        slider.active.index = 0;
-      // set active index to requested slide
-      } else {
-        slider.active.index = slideIndex;
-      }
 
       performTransition = slider.settings.onSlideBefore.call(el, slider.children.eq(slider.active.index), slider.oldIndex, slider.active.index);
 
+      // If transitions canceled, reset and return
       if (typeof (performTransition) !== 'undefined' && !performTransition) {
         slider.active.index = slider.oldIndex; // restore old index
         slider.working = false; // is not in motion
         return;
       }
+
       if (direction === 'next') {
         // Prevent canceling in future functions or lack there-of from negating previous commands to cancel
         if (!slider.settings.onSlideNext.call(el, slider.children.eq(slider.active.index), slider.oldIndex, slider.active.index)) {
@@ -1341,13 +1370,6 @@
         }
       }
 
-      // If transitions canceled, reset and return
-      if (typeof (performTransition) !== 'undefined' && !performTransition) {
-        slider.active.index = slider.oldIndex; // restore old index
-        slider.working = false; // is not in motion
-        return;
-      }
-
       // check if last slide
       slider.active.last = slider.active.index >= getPagerQty() - 1;
       // update the pager with active class
@@ -1399,7 +1421,8 @@
           slider.active.last = false;
         // normal non-zero requests
         } else if (slideIndex >= 0) {
-          requestEl = slideIndex * getMoveBy();
+          //parseInt is applied to allow floats for slides/page
+          requestEl = slideIndex * parseInt(getMoveBy());
           position = slider.children.eq(requestEl).position();
         }
 
@@ -1407,10 +1430,12 @@
          * (e.g. if you destroy the slider on a next click),
          * it doesn't throw an error.
          */
-        if (typeof (position) !== undefined) {
+        if (typeof (position) !== 'undefined') {
           value = slider.settings.mode === 'horizontal' ? -(position.left - moveBy) : -position.top;
           // plugin values to be animated
           setPositionProperty(value, 'slide', slider.settings.speed);
+        } else {
+          slider.working = false;
         }
       }
       if (slider.settings.ariaHidden) { applyAriaHiddenAttributes(slider.active.index * getMoveBy()); }

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

@@ -1,5 +1,5 @@
 /**
- * bxSlider v4.2.4
+ * bxSlider v4.2.5
  * Copyright 2013-2015 Steven Wanderski
  * Written while drinking Belgian ales and listening to jazz
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bxslider-rails
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.5
 platform: ruby
 authors:
 - Mauricio N. Ferreira