diff options
| -rw-r--r-- | tests/visual/progressbar.html | 9 | ||||
| -rw-r--r-- | ui/ui.progressbar.js | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/visual/progressbar.html b/tests/visual/progressbar.html index 89052652a..008ff8c68 100644 --- a/tests/visual/progressbar.html +++ b/tests/visual/progressbar.html @@ -10,6 +10,7 @@ <script type="text/javascript" src="../../ui/ui.resizable.js"></script>
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
<script type="text/javascript" src="../../ui/ui.progressbar.js"></script>
+<script type="text/javascript" src="../../ui/effects.core.js"></script>
<style type="text/css" media="all">
@@ -169,11 +170,13 @@ $(function() { //align: 'right',
+ equation: 'easeOutBounce',
+
width: 500,
- duration: 1000,
+ duration: 3000,
- interval: 1000,
+ interval: 800,
increment: 1,
@@ -213,6 +216,8 @@ $(function() { duration: 5000,
+ equation: 'easeInOutQuint',
+
interval: 2000,
increment: 50,
diff --git a/ui/ui.progressbar.js b/ui/ui.progressbar.js index 34c860c55..e79579503 100644 --- 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); |