From 781b0ee26284e0069b542187123d567556ab03c4 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 28 Sep 2011 10:06:51 +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 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Pman.Dialog.Image.bjs b/Pman.Dialog.Image.bjs index 2b51b4de..5a1de868 100644 --- a/Pman.Dialog.Image.bjs +++ b/Pman.Dialog.Image.bjs @@ -36,7 +36,7 @@ "items": [ { "listeners": { - "|actioncomplete": "function(_self,act)\n{\n _this.dialog.uploadComplete = true;\n _this.dialog.el.unmask();\n \n if (act.type == 'setdata') { \n this.url = _this.data._url ? _this.data._url : baseURL + '/Roo/Images.php';\n this.el.dom.action = this.url;\n this.findField('UPLOAD_IDENTIFIER').setValue(\n (new Date() * 1) + '' + Math.random());\n \n return;\n }\n \n \n if (act.type == 'load') {\n // should this happen? \n _this.data = act.result.data;\n // _this.loaded();\n return;\n }\n \n \n if (act.type == 'submit') { // only submitted here if we are \n _this.dialog.hide();\n \n //console.log(act);\n if (_this.callback) {\n _this.callback.call(this, act.result.data);\n }\n return; \n }\n}\n", + "|actioncomplete": "function(_self,act)\n{\n _this.dialog.uploadComplete = true;\n _this.haveProgress = 2; \n Roo.MessageBox.hide(); // force hiding\n _this.dialog.el.unmask();\n \n if (act.type == 'setdata') { \n this.url = _this.data._url ? _this.data._url : baseURL + '/Roo/Images.php';\n this.el.dom.action = this.url;\n this.findField('UPLOAD_IDENTIFIER').setValue(\n (new Date() * 1) + '' + Math.random());\n \n return;\n }\n \n \n if (act.type == 'load') {\n // should this happen? \n _this.data = act.result.data;\n // _this.loaded();\n return;\n }\n \n \n if (act.type == 'submit') { // only submitted here if we are \n _this.dialog.hide();\n \n //console.log(act);\n if (_this.callback) {\n _this.callback.call(this, act.result.data);\n }\n return; \n }\n}\n", "|rendered": "function (form)\n{\n _this.form= form;\n}\n", "actionfailed": "function (_self, act)\n{\n _this.dialog.uploadComplete = true;\n _this.dialog.el.unmask();\n // error msg???\n \n if (act.type == 'submit') {\n //Roo.log(act);\n try {\n Roo.MessageBox.alert(\"Error\", act.result.errorMsg);\n } catch(e) {\n // Roo.log(e);\n Roo.MessageBox.alert(\"Error\", \"Saving failed = fix errors and try again\"); \n }\n return;\n }\n \n // what about load failing..\n Roo.MessageBox.alert(\"Error\", \"Error loading details\"); \n}" }, diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js index bba653f2..aaf12aa8 100644 --- a/Pman.Dialog.Image.js +++ b/Pman.Dialog.Image.js @@ -111,6 +111,8 @@ Pman.Dialog.Image = { actioncomplete : function(_self,act) { _this.dialog.uploadComplete = true; + _this.haveProgress = 2; + Roo.MessageBox.hide(); // force hiding _this.dialog.el.unmask(); if (act.type == 'setdata') { -- 2.39.2