Merge pull request #835 from molotoff/master

Add animation method to Autoscroll plugin
jsor · May 31, 2018 · e9d7d31 · e9d7d31
2 parents 516e626 + 86b6912
commit e9d7d31
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 25 deletions.
diff --git a/dist/jquery.jcarousel-autoscroll.js b/dist/jquery.jcarousel-autoscroll.js
@@ -1,4 +1,4 @@
-/*! jCarousel - v0.3.7 - 2018-02-17
+/*! jCarousel - v0.3.8 - 2018-05-31
 * http://sorgalla.com/jcarousel/
 * Copyright (c) 2006-2018 Jan Sorgalla; Licensed MIT */
 (function($, document) {
@@ -26,7 +26,8 @@
         _options: {
             target:    '+=1',
             interval:  3000,
-            autostart: true
+            autostart: true,
+            method: 'scroll'
         },
         _timer: null,
         _started: false,
@@ -78,7 +79,7 @@
                 .one('jcarousel:animateend', this.onAnimateEnd);
 
             this._timer = setTimeout($.proxy(function() {
-                this.carousel().jcarousel('scroll', this.options('target'));
+                this.carousel().jcarousel(this.options('method'), this.options('target'));
             }, this), this.options('interval'));
 
             return this;

diff --git a/dist/jquery.jcarousel-autoscroll.min.js b/dist/jquery.jcarousel-autoscroll.min.js
diff --git a/dist/jquery.jcarousel-control.js b/dist/jquery.jcarousel-control.js
@@ -1,4 +1,4 @@
-/*! jCarousel - v0.3.7 - 2018-02-17
+/*! jCarousel - v0.3.8 - 2018-05-31
 * http://sorgalla.com/jcarousel/
 * Copyright (c) 2006-2018 Jan Sorgalla; Licensed MIT */
 (function($) {

diff --git a/dist/jquery.jcarousel-control.min.js b/dist/jquery.jcarousel-control.min.js
diff --git a/dist/jquery.jcarousel-core.js b/dist/jquery.jcarousel-core.js
@@ -1,12 +1,12 @@
-/*! jCarousel - v0.3.7 - 2018-02-17
+/*! jCarousel - v0.3.8 - 2018-05-31
 * http://sorgalla.com/jcarousel/
 * Copyright (c) 2006-2018 Jan Sorgalla; Licensed MIT */
 (function($) {
     'use strict';
 
     var jCarousel = $.jCarousel = {};
 
-    jCarousel.version = '0.3.7';
+    jCarousel.version = '0.3.8';
 
     var rRelativeTarget = /^([+\-]=)?(.+)$/;
 

diff --git a/dist/jquery.jcarousel-core.min.js b/dist/jquery.jcarousel-core.min.js
diff --git a/dist/jquery.jcarousel-pagination.js b/dist/jquery.jcarousel-pagination.js
@@ -1,4 +1,4 @@
-/*! jCarousel - v0.3.7 - 2018-02-17
+/*! jCarousel - v0.3.8 - 2018-05-31
 * http://sorgalla.com/jcarousel/
 * Copyright (c) 2006-2018 Jan Sorgalla; Licensed MIT */
 (function($) {

diff --git a/dist/jquery.jcarousel-pagination.min.js b/dist/jquery.jcarousel-pagination.min.js
diff --git a/dist/jquery.jcarousel-scrollintoview.js b/dist/jquery.jcarousel-scrollintoview.js
@@ -1,4 +1,4 @@
-/*! jCarousel - v0.3.7 - 2018-02-17
+/*! jCarousel - v0.3.8 - 2018-05-31
 * http://sorgalla.com/jcarousel/
 * Copyright (c) 2006-2018 Jan Sorgalla; Licensed MIT */
 (function($) {

diff --git a/dist/jquery.jcarousel-scrollintoview.min.js b/dist/jquery.jcarousel-scrollintoview.min.js
diff --git a/dist/jquery.jcarousel.js b/dist/jquery.jcarousel.js
@@ -1,12 +1,12 @@
-/*! jCarousel - v0.3.7 - 2018-02-17
+/*! jCarousel - v0.3.8 - 2018-05-31
 * http://sorgalla.com/jcarousel/
 * Copyright (c) 2006-2018 Jan Sorgalla; Licensed MIT */
 (function($) {
     'use strict';
 
     var jCarousel = $.jCarousel = {};
 
-    jCarousel.version = '0.3.7';
+    jCarousel.version = '0.3.8';
 
     var rRelativeTarget = /^([+\-]=)?(.+)$/;
 
@@ -1400,7 +1400,8 @@
         _options: {
             target:    '+=1',
             interval:  3000,
-            autostart: true
+            autostart: true,
+            method: 'scroll'
         },
         _timer: null,
         _started: false,
@@ -1452,7 +1453,7 @@
                 .one('jcarousel:animateend', this.onAnimateEnd);
 
             this._timer = setTimeout($.proxy(function() {
-                this.carousel().jcarousel('scroll', this.options('target'));
+                this.carousel().jcarousel(this.options('method'), this.options('target'));
             }, this), this.options('interval'));
 
             return this;

diff --git a/dist/jquery.jcarousel.min.js b/dist/jquery.jcarousel.min.js
diff --git a/docs/plugins/autoscroll/reference/configuration.md b/docs/plugins/autoscroll/reference/configuration.md
@@ -6,6 +6,7 @@ The plugin accepts the following options:
 * [target](#target)
 * [interval](#interval)
 * [autostart](#autostart)
+* [method](#method)
 
 Options can be set either on [initialization](installation.md#setup) or at
 [runtime](api.md#reload).
@@ -67,3 +68,21 @@ $('.jcarousel').jcarouselAutoscroll({
 ### Default
 
 `true`
+
+
+method
+------
+
+The method to call on the carousel.
+
+### Example
+
+```javascript
+$('.jcarousel').jcarouselAutoscroll({
+    method: 'scrollIntoView'
+});
+```
+
+### Default
+
+`scroll`
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "jcarousel",
   "title": "jCarousel",
   "description": "Riding carousels with jQuery",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "homepage": "http://sorgalla.com/jcarousel/",
   "author": {
     "name": "Jan Sorgalla",

diff --git a/src/autoscroll.js b/src/autoscroll.js
@@ -30,7 +30,8 @@
         _options: {
             target:    '+=1',
             interval:  3000,
-            autostart: true
+            autostart: true,
+            method: 'scroll'
         },
         _timer: null,
         _started: false,
@@ -82,7 +83,7 @@
                 .one('jcarousel:animateend', this.onAnimateEnd);
 
             this._timer = setTimeout($.proxy(function() {
-                this.carousel().jcarousel('scroll', this.options('target'));
+                this.carousel().jcarousel(this.options('method'), this.options('target'));
             }, this), this.options('interval'));
 
             return this;