Merge pull request #21 from nicholaswhite656/numerical-easing

feature: easing can be configured by number
igorlino · Nov 14, 2015 · beb3dd8 · beb3dd8
2 parents 4b4d467 + 32bdd14
commit beb3dd8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/demo/examples.htm b/demo/examples.htm
@@ -658,7 +658,7 @@ <h3><a name="easing">Easing</a></h3>
 
                         <p>
                             You can use the default easing or a custom easing setting.
-                            The amount of easing can also be altered - default is 12, set higher for more, lower for
+                            The amount of easing can also be altered - default is 16, set higher for more, lower for
                             less
 
                         </p>
@@ -670,6 +670,7 @@ <h3><a name="easing">Easing</a></h3>
                         $(document).ready(function () {
                             $("#zoom_10").ezPlus({
                                 easing: true
+                                // true is the same as 16; try 5 or 20
                             });
 
                         });

diff --git a/src/jquery.ez-plus.js b/src/jquery.ez-plus.js
@@ -1095,6 +1095,10 @@ if (typeof Object.create !== 'function') {
                     if (!self.yp) {
                         self.yp = 0;
                     }
+                    var interval = 16;
+                    if (Number.isInteger(parseInt(self.options.easing))){
+                      interval = parseInt(self.options.easing);
+                    }
                     //if loop not already started, then run it
                     if (!self.loop) {
                         self.loop = setInterval(function () {
@@ -1190,7 +1194,7 @@ if (typeof Object.create !== 'function') {
 
                                 self.zoomWindow.css('background-position', self.xp + 'px ' + self.yp + 'px');
                             }
-                        }, 16);
+                        }, interval);
                     }
                 }
                 else {