From 36311cfd404a0372d24ff43ee2d8ac476d5c4f06 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 28 Sep 2011 10:05:56 +0800 Subject: [PATCH] Pman.Dialog.Image.bjs Pman.Dialog.Image.bjs Pman.Dialog.Image.js Pman.Dialog.Image.js --- Pman.Dialog.Image.bjs | 2 +- Pman.Dialog.Image.js | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Pman.Dialog.Image.bjs b/Pman.Dialog.Image.bjs index 5550be93..02f9f816 100644 --- a/Pman.Dialog.Image.bjs +++ b/Pman.Dialog.Image.bjs @@ -20,7 +20,7 @@ "width": 500, "xtype": "LayoutDialog", "|shadow": "true", - "|uploadProgress": "function()\n{\n var dlg = this;\n if (!dlg.haveProgress) {\n Roo.MessageBox.progress(\"Uploading\", \"Uploading\");\n }\n if (dlg.uploadComplete) {\n Roo.MessageBox.hide();\n return;\n }\n dlg.haveProgress = true;\n\n var uid = _this.form.findField('UPLOAD_IDENTIFIER').getValue();\n Pman.request({\n url : baseURL + '/Core/UploadProgress.php',\n params: {\n id : uid\n },\n method: 'GET',\n success : function(data){\n //console.log(data);\n if (dlg.uploadComplete) {\n Roo.MessageBox.hide();\n return;\n }\n \n if (data){\n Roo.MessageBox.updateProgress(data.bytes_uploaded/data.bytes_total,\n Math.floor((data.bytes_total - data.bytes_uploaded)/1000) + 'k remaining'\n );\n }\n dlg.uploadProgress.defer(2000,dlg);\n },\n failure: function(data) {\n // console.log('fail');\n // console.log(data);\n }\n })\n \n}\n", + "|uploadProgress": "function()\n{\n var dlg = this;\n if (!dlg.haveProgress) {\n Roo.MessageBox.progress(\"Uploading\", \"Uploading\");\n }\n \n if (dlg.haveProgress == 2) {\n // it's been closed elsewhere..\n return;\n }\n if (dlg.uploadComplete) {\n Roo.MessageBox.hide();\n return;\n }\n \n dlg.haveProgress = 1;\n\n var uid = _this.form.findField('UPLOAD_IDENTIFIER').getValue();\n Pman.request({\n url : baseURL + '/Core/UploadProgress.php',\n params: {\n id : uid\n },\n method: 'GET',\n success : function(data){\n //console.log(data);\n if (dlg.uploadComplete) {\n Roo.MessageBox.hide();\n return;\n }\n \n if (data){\n Roo.MessageBox.updateProgress(data.bytes_uploaded/data.bytes_total,\n Math.floor((data.bytes_total - data.bytes_uploaded)/1000) + 'k remaining'\n );\n }\n dlg.uploadProgress.defer(2000,dlg);\n },\n failure: function(data) {\n // console.log('fail');\n // console.log(data);\n }\n })\n \n}\n", "|xns": "Roo", "items": [ { diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js index e7065da8..165816af 100644 --- a/Pman.Dialog.Image.js +++ b/Pman.Dialog.Image.js @@ -57,11 +57,17 @@ Pman.Dialog.Image = { if (!dlg.haveProgress) { Roo.MessageBox.progress("Uploading", "Uploading"); } + + if (dlg.haveProgress == 2) { + // it's been closed elsewhere.. + return; + } if (dlg.uploadComplete) { Roo.MessageBox.hide(); return; } - dlg.haveProgress = true; + + dlg.haveProgress = 1; var uid = _this.form.findField('UPLOAD_IDENTIFIER').getValue(); Pman.request({ -- 2.39.2