From a74244d7d5d4ee4cc95fe5592da36562c0ba81e2 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 16 Aug 2012 15:51:56 +0800 Subject: [PATCH] Pman.Dialog.Image.bjs Pman.Dialog.Image.js --- Pman.Dialog.Image.bjs | 2 +- Pman.Dialog.Image.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Pman.Dialog.Image.bjs b/Pman.Dialog.Image.bjs index c14838d4..2452bfc0 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 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 \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 }\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 }\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 5d854739..60f3e508 100644 --- a/Pman.Dialog.Image.js +++ b/Pman.Dialog.Image.js @@ -70,15 +70,15 @@ Pman.Dialog.Image = { dlg.haveProgress = 1; var uid = _this.form.findField('UPLOAD_IDENTIFIER').getValue(); - Pman.request({ + new Pman.Request({ url : baseURL + '/Core/UploadProgress.php', params: { id : uid }, method: 'GET', - success : function(data){ + success : function(res){ //console.log(data); - + var data = res.data; if (dlg.haveProgress == 2) { // it's been closed elsewhere.. return; -- 2.39.2