Bump 2.6.0 release

azi · Apr 9, 2014 · ec9ba05 · ec9ba05
1 parent 914ec67
commit ec9ba05
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 17 deletions.
diff --git a/bower.json b/bower.json
@@ -5,7 +5,7 @@
     "url": "https://github.com/nolimits4web/Swiper.git"
   },
   "description": "Mobile touch slider and framework with hardware accelerated transitions",
-  "version": "2.5.5",
+  "version": "2.6.0",
   "author": "Vladimir Kharlampidi",
   "homepage": "http://www.idangero.us/sliders/swiper/",
   "keywords": ["swiper", "swipe", "slider"],

diff --git a/dist/idangerous.swiper.css b/dist/idangerous.swiper.css
@@ -1,5 +1,5 @@
 /*
- * Swiper 2.5.5
+ * Swiper 2.6.0
  * Mobile touch slider and framework with hardware accelerated transitions
  *
  * http://www.idangero.us/sliders/swiper/
@@ -10,7 +10,7 @@
  *
  * Licensed under GPL & MIT
  *
- * Released on: March 23, 2014
+ * Released on: April 9, 2014
 */
 .swiper-container {
 	margin:0 auto;

diff --git a/dist/idangerous.swiper.js b/dist/idangerous.swiper.js
@@ -1,5 +1,5 @@
 /*
- * Swiper 2.5.5
+ * Swiper 2.6.0
  * Mobile touch slider and framework with hardware accelerated transitions
  *
  * http://www.idangero.us/sliders/swiper/
@@ -10,7 +10,7 @@
  *
  * Licensed under GPL & MIT
  *
- * Released on: March 23, 2014
+ * Released on: April 9, 2014
 */
 var Swiper = function (selector, params) {
     'use strict';
@@ -1212,6 +1212,19 @@ var Swiper = function (selector, params) {
         else e.returnValue = false;
         return false;
     }
+    _this.disableMousewheelControl = function () {
+        if (!_this._wheelEvent) return false;
+        params.mousewheelControl = false;
+        _this.h.removeEventListener(_this.container, _this._wheelEvent, handleMousewheel);
+        return true;
+    };
+
+    _this.enableMousewheelControl = function () {
+        if (!_this._wheelEvent) return false;
+        params.mousewheelControl = true;
+        _this.h.addEventListener(_this.container, _this._wheelEvent, handleMousewheel);
+        return true;
+    };
 
     /*=========================
       Grab Cursor
@@ -1337,7 +1350,7 @@ var Swiper = function (selector, params) {
             }
 
             //CallBack
-            if (params.onTouchStart) _this.fireCallback(params.onTouchStart, _this);
+            if (params.onTouchStart) _this.fireCallback(params.onTouchStart, _this, event);
             _this.callPlugins('onTouchStartEnd');
 
         }
@@ -1486,7 +1499,7 @@ var Swiper = function (selector, params) {
             velocityPrevTime = (new Date()).getTime();
             //Callbacks
             _this.callPlugins('onTouchMoveEnd');
-            if (params.onTouchMove) _this.fireCallback(params.onTouchMove, _this);
+            if (params.onTouchMove) _this.fireCallback(params.onTouchMove, _this, event);
 
             return false;
         }
@@ -1558,13 +1571,13 @@ var Swiper = function (selector, params) {
         //Not moved or Prevent Negative Back Sliding/After-End Sliding
         if (!_this.isMoved && params.freeMode) {
             _this.isMoved = false;
-            if (params.onTouchEnd) _this.fireCallback(params.onTouchEnd, _this);
+            if (params.onTouchEnd) _this.fireCallback(params.onTouchEnd, _this, event);
             _this.callPlugins('onTouchEnd');
             return;
         }
         if (!_this.isMoved || _this.positions.current > 0 || _this.positions.current < -maxPosition) {
             _this.swipeReset();
-            if (params.onTouchEnd) _this.fireCallback(params.onTouchEnd, _this);
+            if (params.onTouchEnd) _this.fireCallback(params.onTouchEnd, _this, event);
             _this.callPlugins('onTouchEnd');
             return;
         }
@@ -1620,7 +1633,7 @@ var Swiper = function (selector, params) {
             }
             if (!params.freeModeFluid || timeDiff >= 300) _this.updateActiveSlide(_this.positions.current);
 
-            if (params.onTouchEnd) _this.fireCallback(params.onTouchEnd, _this);
+            if (params.onTouchEnd) _this.fireCallback(params.onTouchEnd, _this, event);
             _this.callPlugins('onTouchEnd');
             return;
         }
@@ -1675,7 +1688,7 @@ var Swiper = function (selector, params) {
                 _this.swipeReset();
             }
         }
-        if (params.onTouchEnd) _this.fireCallback(params.onTouchEnd, _this);
+        if (params.onTouchEnd) _this.fireCallback(params.onTouchEnd, _this, event);
         _this.callPlugins('onTouchEnd');
     }
 
@@ -2499,7 +2512,9 @@ Swiper.prototype = {
         if (this.support.transforms && this.params.useCSS3Transforms) {
             curStyle = window.getComputedStyle(el, null);
             if (window.WebKitCSSMatrix) {
-                transformMatrix = new WebKitCSSMatrix(curStyle.webkitTransform);
+                // Some old versions of Webkit choke when 'none' is passed; pass
+                // empty string instead in this case
+                transformMatrix = new WebKitCSSMatrix(curStyle.webkitTransform === 'none' ? '' : curStyle.webkitTransform);
             }
             else {
                 transformMatrix = curStyle.MozTransform || curStyle.OTransform || curStyle.MsTransform || curStyle.msTransform  || curStyle.transform || curStyle.getPropertyValue('transform').replace('translate(', 'matrix(1, 0, 0, 1,');

diff --git a/dist/idangerous.swiper.min.js b/dist/idangerous.swiper.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Swiper",
-  "version": "2.5.5",
+  "version": "2.6.0",
   "description": "Mobile touch slider and framework with hardware accelerated transitions",
   "main": "dist/idangerous.swiper.js",
   "repository": {