From fde7181f60938feae2a399571df7c6485166dc89 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 1 Apr 2013 17:46:05 +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 c157ad71..7f0fb201 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.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 Roo.log(\"Upload success\");\n Roo.log(act);\n //console.log(act);\n if (_this.callback) {\n _this.callback.call(this, act.result.data);\n }\n return; \n }\n \n\n \n}\n", + "|actioncomplete": "function(_self,act)\n{\n _this.dialog.uploadComplete = true;\n _this.dialog.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 Roo.log(\"Upload success\");\n Roo.log(act);\n //console.log(act);\n if (_this.callback) {\n _this.callback.call(this, act.result.data, act.result.extra);\n }\n return; \n }\n \n\n \n}\n", "|rendered": "function (form)\n{\n _this.form= form;\n}\n", "actionfailed": "function (_self, act)\n{\n \n \n _this.dialog.uploadComplete = true;\n // _this.dialog.el.unmask();\n // error msg???\n _this.dialog.haveProgress = 2; \n if (act.type == 'submit') {\n Roo.log(\"Upload error\");\n Roo.log(act);\n \n try {\n Roo.MessageBox.alert(\"Error\", act.result.errorMsg.split(/\\n/).join('
'));\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 d510dbda..202afe9b 100644 --- a/Pman.Dialog.Image.js +++ b/Pman.Dialog.Image.js @@ -145,7 +145,7 @@ Pman.Dialog.Image = { Roo.log(act); //console.log(act); if (_this.callback) { - _this.callback.call(this, act.result.data); + _this.callback.call(this, act.result.data, act.result.extra); } return; } -- 2.39.2