From 25df6f31ccc0643ec3d0e95033fdae7818613bc7 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 3 Apr 2013 15:01:14 +0800 Subject: [PATCH] Pman.Dialog.Image.bjs Pman.Dialog.Image.js --- Pman.Dialog.Image.bjs | 2 +- Pman.Dialog.Image.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Pman.Dialog.Image.bjs b/Pman.Dialog.Image.bjs index 0dd71531..bb954b0d 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 \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 new Pman.Request({\n url : baseURL + '/Core/UploadProgress.php',\n params: {\n id : uid\n },\n method: 'GET',\n success : function(res){\n //console.log(data);\n var data = res.data;\n if (dlg.haveProgress == 2) {\n // it's been closed elsewhere..\n return;\n }\n \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 } else {\n Roo.MessageBox.updateProgress(1,\n \"Upload Complete - processing\"\n );\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 new Pman.Request({\n url : baseURL + '/Core/UploadProgress.php',\n params: {\n id : uid\n },\n method: 'GET',\n success : function(res){\n //console.log(data);\n var data = res.data;\n if (dlg.haveProgress == 2) {\n // it's been closed elsewhere..\n return;\n }\n \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 } else {\n Roo.MessageBox.updateProgress(1,\n \"Upload Complete - processing\"\n );\n return;\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 e4632893..0a5b55fc 100644 --- a/Pman.Dialog.Image.js +++ b/Pman.Dialog.Image.js @@ -97,7 +97,7 @@ Pman.Dialog.Image = { Roo.MessageBox.updateProgress(1, "Upload Complete - processing" ); - + return; } dlg.uploadProgress.defer(2000,dlg); }, -- 2.39.2