git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.1.1 - Released 02/08/2010
[extjs.git]
/
src
/
widgets
/
ProgressBar.js
diff --git
a/src/widgets/ProgressBar.js
b/src/widgets/ProgressBar.js
index
dc2a9dd
..
4e71e69
100644
(file)
--- a/
src/widgets/ProgressBar.js
+++ b/
src/widgets/ProgressBar.js
@@
-1,6
+1,6
@@
/*!
/*!
- * Ext JS Library 3.
0.0
- * Copyright(c) 2006-20
09
Ext JS, LLC
+ * Ext JS Library 3.
1.1
+ * Copyright(c) 2006-20
10
Ext JS, LLC
* licensing@extjs.com
* http://www.extjs.com/license
*/
* licensing@extjs.com
* http://www.extjs.com/license
*/
@@
-120,7
+120,7
@@
Ext.ProgressBar = Ext.extend(Ext.BoxComponent, {
if(text){
\r
this.updateText(text);
\r
}
\r
if(text){
\r
this.updateText(text);
\r
}
\r
- if(this.rendered){
\r
+ if(this.rendered
&& !this.isDestroyed
){
\r
var w = Math.floor(value*this.el.dom.firstChild.offsetWidth);
\r
this.progressBar.setWidth(w, animate === true || (animate !== false && this.animate));
\r
if(this.textTopEl){
\r
var w = Math.floor(value*this.el.dom.firstChild.offsetWidth);
\r
this.progressBar.setWidth(w, animate === true || (animate !== false && this.animate));
\r
if(this.textTopEl){
\r
@@
-197,6
+197,7
@@
myAction.on('complete', function(){
this.waitTimer = Ext.TaskMgr.start({
\r
run: function(i){
\r
var inc = o.increment || 10;
\r
this.waitTimer = Ext.TaskMgr.start({
\r
run: function(i){
\r
var inc = o.increment || 10;
\r
+ i -= 1;
\r
this.updateProgress(((((i+inc)%inc)+1)*(100/inc))*0.01, null, o.animate);
\r
},
\r
interval: o.interval || 1000,
\r
this.updateProgress(((((i+inc)%inc)+1)*(100/inc))*0.01, null, o.animate);
\r
},
\r
interval: o.interval || 1000,
\r
@@
-275,15
+276,31
@@
myAction.on('complete', function(){
if(this.textTopEl){
\r
this.textTopEl.addClass('x-hidden');
\r
}
\r
if(this.textTopEl){
\r
this.textTopEl.addClass('x-hidden');
\r
}
\r
+ this.clearTimer();
\r
+ if(hide === true){
\r
+ this.hide();
\r
+ }
\r
+ return this;
\r
+ },
\r
+
\r
+ // private
\r
+ clearTimer : function(){
\r
if(this.waitTimer){
\r
this.waitTimer.onStop = null; //prevent recursion
\r
Ext.TaskMgr.stop(this.waitTimer);
\r
this.waitTimer = null;
\r
}
\r
if(this.waitTimer){
\r
this.waitTimer.onStop = null; //prevent recursion
\r
Ext.TaskMgr.stop(this.waitTimer);
\r
this.waitTimer = null;
\r
}
\r
- if(hide === true){
\r
- this.hide();
\r
+ },
\r
+
\r
+ onDestroy: function(){
\r
+ this.clearTimer();
\r
+ if(this.rendered){
\r
+ if(this.textEl.isComposite){
\r
+ this.textEl.clear();
\r
+ }
\r
+ Ext.destroyMembers(this, 'textEl', 'progressBar', 'textTopEl');
\r
}
\r
}
\r
-
return this
;
\r
+
Ext.ProgressBar.superclass.onDestroy.call(this)
;
\r
}
\r
});
\r
Ext.reg('progress', Ext.ProgressBar);
\ No newline at end of file
}
\r
});
\r
Ext.reg('progress', Ext.ProgressBar);
\ No newline at end of file