From 38044096b28b21623001378efa9df27e2f15f228 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 22 Jan 2016 13:39:44 +0800 Subject: [PATCH] Pman.Dialog.CoreEnumMerge.bjs Pman.Dialog.CoreEnumMerge.js --- Pman.Dialog.CoreEnumMerge.bjs | 2 +- Pman.Dialog.CoreEnumMerge.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs index 255be65d..28069f71 100644 --- a/Pman.Dialog.CoreEnumMerge.bjs +++ b/Pman.Dialog.CoreEnumMerge.bjs @@ -40,7 +40,7 @@ "items" : [ { "listeners" : { - "actionfailed" : "function (_self, action)\n{\n _this.dialog.el.unmask();\n Pman.standardActionFailed(_self, action);\n}\n", + "actionfailed" : "function (_self, action)\n{\n \n Pman.standardActionFailed(_self, action);\n}\n", "actioncomplete" : "function (_self, action)\n{\n\n if (action.type =='submit') {\n \n _this.dialog.hide();\n \n if (_this.callback) {\n _this.callback.call(_this, _this.form.getValues());\n }\n _this.form.reset();\n return;\n }\n if (action.type == 'setdata') {\n \n var title = _this.data.title || _this.data.etype;\n _this.dialog.setTitle(\"Delete selected \" + title + \" and merge data with\");\n \n return;\n }\n \n}\n", "rendered" : "function (form)\n{\n _this.form = form;\n}" }, diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js index 681f583b..fc892a4b 100644 --- a/Pman.Dialog.CoreEnumMerge.js +++ b/Pman.Dialog.CoreEnumMerge.js @@ -129,7 +129,7 @@ Pman.Dialog.CoreEnumMerge = { }, actionfailed : function (_self, action) { - _this.dialog.el.unmask(); + Pman.standardActionFailed(_self, action); }, rendered : function (form) -- 2.39.2