diff --git a/o2web/source/o2_core/o2/framework.js b/o2web/source/o2_core/o2/framework.js index a00783a666587ac41f372eb1f80ba225f9a5602d..c98fb600955a6ea6380ac0927ee17a0837fe26f0 100644 --- a/o2web/source/o2_core/o2/framework.js +++ b/o2web/source/o2_core/o2/framework.js @@ -1,3 +1,4 @@ +layout.app = true; layout.addReady(function(){ // MWF.require("MWF.xScript.Environment", null, false); // MWF.require("MWF.xScript.PageEnvironment", null, false); diff --git a/o2web/source/x_component_process_FormDesigner/Module/Tab$Content.js b/o2web/source/x_component_process_FormDesigner/Module/Tab$Content.js index 956d9cd151e3d964b1f807630765834c6fcdb4ab..0c95548cdb25c80e128a05156ecfc46437975af3 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Tab$Content.js +++ b/o2web/source/x_component_process_FormDesigner/Module/Tab$Content.js @@ -103,8 +103,10 @@ MWF.xApplication.process.FormDesigner.Module.Tab$Content = MWF.FCTab$Content = n }.bind(this)); }, _recoveryModuleData: function(){ - this.node.set("style", this.recoveryWidgetstyle); + if (this.recoveryWidgetstyle) this.node.set("style", this.recoveryWidgetstyle); this.recoveryWidgetstyle = null; + if (this.json.recoveryStyles) this.json.styles = this.json.recoveryStyles; + this.json.recoveryStyles = null; }, setCustomStyles: function(){ this._recoveryModuleData(); diff --git a/o2web/source/x_component_process_FormDesigner/Module/Tab$Page.js b/o2web/source/x_component_process_FormDesigner/Module/Tab$Page.js index 6058b7e6c544f686813a5953d3510a99a2ae75e1..bd4c9c1187013eda583fa032023c5990a5077175 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Tab$Page.js +++ b/o2web/source/x_component_process_FormDesigner/Module/Tab$Page.js @@ -254,8 +254,10 @@ MWF.xApplication.process.FormDesigner.Module.Tab$Page = MWF.FCTab$Page = new Cla }.bind(this)); }, _recoveryModuleData: function(){ - this.node.set("style", this.recoveryWidgetstyle); + if (this.recoveryWidgetstyle) this.node.set("style", this.recoveryWidgetstyle); this.recoveryWidgetstyle = null; + if (this.json.recoveryStyles) this.json.styles = this.json.recoveryStyles; + this.json.recoveryStyles = null; }, setCustomStyles: function(){ this._recoveryModuleData(); diff --git a/o2web/source/x_component_process_FormDesigner/Module/Tab.js b/o2web/source/x_component_process_FormDesigner/Module/Tab.js index a2aeb02066fb935d3d43cd24df9e165cf92a39dd..db12c66939948c8fc0e0948b4792ac92aea7dd67 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Tab.js +++ b/o2web/source/x_component_process_FormDesigner/Module/Tab.js @@ -398,8 +398,10 @@ MWF.xApplication.process.FormDesigner.Module.Tab = MWF.FCTab = new Class({ }.bind(this)); }, _recoveryModuleData: function(){ - this.node.set("style", this.recoveryWidgetstyle); + if (this.recoveryWidgetstyle) this.node.set("style", this.recoveryWidgetstyle); this.recoveryWidgetstyle = null; + if (this.json.recoveryStyles) this.json.styles = this.json.recoveryStyles; + this.json.recoveryStyles = null; }, setCustomStyles: function(){ this._recoveryModuleData();