From a672729e238f7f89614f06b90cc412c6f5b1351d Mon Sep 17 00:00:00 2001 From: Edward Date: Mon, 3 Sep 2018 12:51:22 +0800 Subject: [PATCH] Pman.Dialog.CmsBlog.bjs Pman.Dialog.CmsBlog.js --- Pman.Dialog.CmsBlog.bjs | 2 +- Pman.Dialog.CmsBlog.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Pman.Dialog.CmsBlog.bjs b/Pman.Dialog.CmsBlog.bjs index 29a5afa5..8ad1f8d0 100644 --- a/Pman.Dialog.CmsBlog.bjs +++ b/Pman.Dialog.CmsBlog.bjs @@ -98,7 +98,7 @@ { "listeners" : { "expanded" : "function (_self)\n{\n var id = _this.form.findField('id').getValue() * 1;\n \n if(id < 1){\n Roo.MessageBox.alert('Error', 'Save first');\n this.collapse();\n return;\n }\n \n var w = Roo.lib.Dom.getViewWidth();\n var h = Roo.lib.Dom.getViewHeight();\n \n _self.resizeTo.defer(110, _self,[ w-400, h-350] );\n \n _this.panel.region.collapse();\n \n}", - "collapsed" : "function (_self)\n{\n if(_this.trform){\n _this.trform.reset();\n Roo.log('reset trform');\n }\n \n if(_this.trform1){\n _this.trform1.reset();\n Roo.log('reset trform1');\n }\n \n if(_this.trform2){\n _this.trform2.reset();\n Roo.log('reset trform2');\n }\n \n if(_this.trform3){\n _this.trform3.reset();\n Roo.log('reset trform3');\n }\n \n}", + "collapsed" : "function (_self)\n{\n if(_this.trform && _this.trform.isDirty()){\n _this.trform.reset();\n Roo.log('reset trform');\n }\n \n if(_this.trform1 && _this.trform1.isDirty()){\n _this.trform1.reset();\n Roo.log('reset trform1');\n }\n \n if(_this.trform2 && _this.trform2.isDirty()){\n _this.trform2.reset();\n Roo.log('reset trform2');\n }\n \n if(_this.trform3 && _this.trform3.isDirty()){\n _this.trform3.reset();\n Roo.log('reset trform3');\n }\n \n}", "beforecollapse" : "function (_self)\n{\n if(!_this.trform || !_this.trform1 || !_this.trform2){\n return true;\n }\n \n if(\n !_this.trform.isDirty() &&\n !_this.trform1.isDirty() &&\n !_this.trform2.isDirty() &&\n !_this.trform3.isDirty()\n ) {\n return true;\n }\n \n Roo.MessageBox.confirm(\n \"Confirm\", \n \"Do you want to save the translation\",\n function(res) {\n if(res != 'yes') {\n _self.collapse(true, true);\n return true;\n }\n \n return false;\n }\n );\n \n return false;\n}" }, "collapsedTitle" : "Translations", diff --git a/Pman.Dialog.CmsBlog.js b/Pman.Dialog.CmsBlog.js index f5fb4bf4..bf292dff 100644 --- a/Pman.Dialog.CmsBlog.js +++ b/Pman.Dialog.CmsBlog.js @@ -338,22 +338,22 @@ Pman.Dialog.CmsBlog = { }, collapsed : function (_self) { - if(_this.trform){ + if(_this.trform && _this.trform.isDirty()){ _this.trform.reset(); Roo.log('reset trform'); } - if(_this.trform1){ + if(_this.trform1 && _this.trform1.isDirty()){ _this.trform1.reset(); Roo.log('reset trform1'); } - if(_this.trform2){ + if(_this.trform2 && _this.trform2.isDirty()){ _this.trform2.reset(); Roo.log('reset trform2'); } - if(_this.trform3){ + if(_this.trform3 && _this.trform3.isDirty()){ _this.trform3.reset(); Roo.log('reset trform3'); } -- 2.39.2