Progressbar - Added suport for animated equations (easeInOutQuint, ...)

diff --git a/tests/visual/progressbar.html b/tests/visual/progressbar.html
index 89052652a84a4f44d9fa10ebe7f1ca88d93ee10d..008ff8c689d0eefc664a8705933127b5b9413583 100644 (file)
--- a/tests/visual/progressbar.html
+++ b/tests/visual/progressbar.html
@@ -10,6 +10,7 @@
 <script type="text/javascript" src="../../ui/ui.resizable.js"></script>\r
 <script type="text/javascript" src="../../ui/ui.draggable.js"></script>\r
 <script type="text/javascript" src="../../ui/ui.progressbar.js"></script>\r
+<script type="text/javascript" src="../../ui/effects.core.js"></script>\r
 \r
 <style type="text/css" media="all">\r
 \r
@@ -169,11 +170,13 @@ $(function() {
 \r
                        //align: 'right',\r
 \r
+                       equation: 'easeOutBounce',\r
+\r
                        width: 500,\r
 \r
-                       duration: 1000,\r
+                       duration: 3000,\r
 \r
-                       interval: 1000,\r
+                       interval: 800,\r
 \r
                increment: 1,\r
 \r
@@ -213,6 +216,8 @@ $(function() {
 \r
                        duration: 5000,\r
 \r
+                       equation: 'easeInOutQuint',\r
+\r
                        interval: 2000,\r
 \r
                increment: 50,\r

diff --git a/ui/ui.progressbar.js b/ui/ui.progressbar.js
index 34c860c55d2b13fb00b5fb1daba010955eb8c4f4..e795795035685a5fcc9b3131b3c1011635ce2daa 100644 (file)
--- a/ui/ui.progressbar.js
+++ b/ui/ui.progressbar.js
@@ -130,7 +130,7 @@ $.widget("ui.progressbar", {
                        },
                        {
                                duration: interval,
-                               easing: this.identifier,
+                               easing: options.equation || this.identifier,
                                step: function(step, b) {
                                        self.progress((step/options.width)*100);
                                        var timestamp = new Date().getTime(), elapsedTime  = (timestamp - b.startTime);