From: Alan Knowles Date: Wed, 10 Nov 2010 06:27:26 +0000 (+0800) Subject: Roo/form/Action.js X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=a12b348e8fdddb20443031a4dd37e2fc6910c926;p=roojs1 Roo/form/Action.js --- diff --git a/Roo/form/Action.js b/Roo/form/Action.js index cfee2edd2d..e825aa41e8 100644 --- a/Roo/form/Action.js +++ b/Roo/form/Action.js @@ -130,21 +130,27 @@ Roo.form.Action.Submit = function(form, options){ Roo.extend(Roo.form.Action.Submit, Roo.form.Action, { type : 'submit', + haveProgress : false, + uploadComplete : false, + // uploadPrograss indicator. uploadProgress : function() { - var dlg = this; - if (!dlg.haveProgress) { - Roo.MessageBox.progress("Uploading", "Uploading"); + + if (!this.haveProgress) { + Roo.MessageBox.progress("Uploading", "Uploading"); } - if (dlg.uploadComplete) { + if (this.uploadComplete) { Roo.MessageBox.hide(); return; } - dlg.haveProgress = true; + + this.haveProgress = true; var uid = this.form.findField('UPLOAD_IDENTIFIER').getValue(); - Pman.request({ + + var c = new Roo.Connection(); + c.request({ url : this.form.progressUrl, params: { id : uid @@ -152,18 +158,19 @@ Roo.extend(Roo.form.Action.Submit, Roo.form.Action, { method: 'GET', success : function(data){ //console.log(data); - if (dlg.uploadComplete) { + if (this.uploadComplete) { Roo.MessageBox.hide(); return; } if (data){ - Roo.MessageBox.updateProgress(data.bytes_uploaded/data.bytes_total, + Roo.MessageBox.updateProgress(data.bytes_uploaded/data.bytes_total, Math.floor((data.bytes_total - data.bytes_uploaded)/1000) + 'k remaining' - ); + ); } - dlg.uploadProgress.defer(2000,dlg); + this.uploadProgress.defer(2000,this); }, + scope : this, failure: function(data) { // console.log('fail'); // console.log(data);