r718 - in trunk: tests/visual ui
Author: eduardolundgren
Date: Fri Sep 19 21:22:53 2008
New Revision: 718
Modified:
trunk/tests/visual/progressbar.html
trunk/ui/ui.progressbar.js
Log:
Progressbar - Added suport for animated equations (easeInOutQuint, ...)
Modified: trunk/tests/visual/progressbar.html
==============================================================================
--- trunk/tests/visual/progressbar.html (original)
+++ trunk/tests/visual/progressbar.html Fri Sep 19 21:22:53 2008
@@ -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 @@
//align: 'right',
+ equation: 'easeOutBounce',
+
width: 500,
- duration: 1000,
+ duration: 3000,
- interval: 1000,
+ interval: 800,
increment: 1,
@@ -212,6 +215,8 @@
width: 500,
duration: 5000,
+
+ equation: 'easeInOutQuint',
interval: 2000,
Modified: trunk/ui/ui.progressbar.js
==============================================================================
--- trunk/ui/ui.progressbar.js (original)
+++ trunk/ui/ui.progressbar.js Fri Sep 19 21:22:53 2008
@@ -130,7 +130,7 @@
},
{
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);