diff --git a/o2web/source/x_component_process_Xform/$Input.js b/o2web/source/x_component_process_Xform/$Input.js index d7c6b50b4c5e633d29c23c4c6d63cc2c63b60f18..81fd20ade9aad89dfad5d167a47e11d63966a679 100644 --- a/o2web/source/x_component_process_Xform/$Input.js +++ b/o2web/source/x_component_process_Xform/$Input.js @@ -200,7 +200,7 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input = new Class({ // this.moduleValueAG = null; // }.bind(this)); // }else { - if (o2.typeOf(value.then)=="function"){ + if (!!value && o2.typeOf(value.then)=="function"){ var p = o2.promiseAll(value).then(function(v){ this.__setValue(v); }.bind(this)); @@ -299,7 +299,7 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input = new Class({ // this.moduleValueAG = null; // }.bind(this)); // }else{ - if (o2.typeOf(data.then)=="function"){ + if (!!data && o2.typeOf(data.then)=="function"){ var p = o2.promiseAll(data).then(function(v){ this.__setValue(v); }.bind(this)); diff --git a/o2web/source/x_component_process_Xform/Checkbox.js b/o2web/source/x_component_process_Xform/Checkbox.js index e12b695aacb2a3a86e9962917cb50fb57667031d..0e02a62ecfcbaaeeba4c15141fb2b9c58369fa63 100644 --- a/o2web/source/x_component_process_Xform/Checkbox.js +++ b/o2web/source/x_component_process_Xform/Checkbox.js @@ -156,23 +156,28 @@ MWF.xApplication.process.Xform.Checkbox = MWF.APPCheckbox = new Class({ }, _setValue: function(value){ - var p = o2.promiseAll(value).then(function(v){ - //if (o2.typeOf(v)=="array") v = v[0]; - if (this.moduleSelectAG){ - this.moduleValueAG = this.moduleSelectAG; - this.moduleSelectAG.then(function(){ - this.__setValue(v); - return v; - }.bind(this)); - }else{ - this.__setValue(v) - } - return v; - }.bind(this)); - this.moduleValueAG = p; - if (this.moduleValueAG) this.moduleValueAG.then(function(){ - this.moduleValueAG = null; - }.bind(this)); + if (!!value){ + var p = o2.promiseAll(value).then(function(v){ + //if (o2.typeOf(v)=="array") v = v[0]; + if (this.moduleSelectAG){ + this.moduleValueAG = this.moduleSelectAG; + this.moduleSelectAG.then(function(){ + this.__setValue(v); + return v; + }.bind(this)); + }else{ + this.__setValue(v) + } + return v; + }.bind(this)); + this.moduleValueAG = p; + if (this.moduleValueAG) this.moduleValueAG.then(function(){ + this.moduleValueAG = null; + }.bind(this)); + }else{ + this.__setValue(value); + } + // this.moduleValueAG = o2.AG.all(value).then(function(v){ // if (this.moduleSelectAG){ diff --git a/o2web/source/x_component_process_Xform/Label.js b/o2web/source/x_component_process_Xform/Label.js index de56e7b4a642942b2e04954868c595b8a737e7dc..0ddf06fb119362517ec5f0cf9fce8f0afd8a70e3 100644 --- a/o2web/source/x_component_process_Xform/Label.js +++ b/o2web/source/x_component_process_Xform/Label.js @@ -56,10 +56,13 @@ MWF.xApplication.process.Xform.Label = MWF.APPLabel = new Class({ } }, setText: function(text){ - o2.promiseAll(text).then(function(v){ + if (!!text){ + o2.promiseAll(text).then(function(v){ + this.node.set("text", v || ""); + }.bind(this)); + }else{ this.node.set("text", v || ""); - }.bind(this)); - + } //this.node.set("text", text); } }); diff --git a/o2web/source/x_component_process_Xform/Radio.js b/o2web/source/x_component_process_Xform/Radio.js index b0ecd08480974dec9b4b0131358d62db0ab47b12..3f40e982bc87a20ff491b3086f5f35ea67e4d344 100644 --- a/o2web/source/x_component_process_Xform/Radio.js +++ b/o2web/source/x_component_process_Xform/Radio.js @@ -215,24 +215,29 @@ MWF.xApplication.process.Xform.Radio = MWF.APPRadio = new Class({ }, _setValue: function(value){ - var p = o2.promiseAll(value).then(function(v){ - if (o2.typeOf(v)=="array") v = v[0]; - if (this.moduleSelectAG){ - this.moduleValueAG = this.moduleSelectAG; - this.moduleSelectAG.then(function(){ - this.__setValue(v); - return v; - }.bind(this)); - }else{ - this.__setValue(v) - } - return v; - }.bind(this)); + if (!!value){ + var p = o2.promiseAll(value).then(function(v){ + if (o2.typeOf(v)=="array") v = v[0]; + if (this.moduleSelectAG){ + this.moduleValueAG = this.moduleSelectAG; + this.moduleSelectAG.then(function(){ + this.__setValue(v); + return v; + }.bind(this)); + }else{ + this.__setValue(v) + } + return v; + }.bind(this)); + + this.moduleValueAG = p; + if (this.moduleValueAG) this.moduleValueAG.then(function(){ + this.moduleValueAG = null; + }.bind(this)); + }else{ + this.__setValue(value); + } - this.moduleValueAG = p; - if (this.moduleValueAG) this.moduleValueAG.then(function(){ - this.moduleValueAG = null; - }.bind(this)); // this.moduleValueAG = o2.AG.all(value).then(function(v){ // if (o2.typeOf(v)=="array") v = v[0]; diff --git a/o2web/source/x_component_process_Xform/Select.js b/o2web/source/x_component_process_Xform/Select.js index e12dc840563e4057c66a4bffa9a57a05c5890211..2439a664cf1f83fb6ee3015f6a59c4b1f17629f3 100644 --- a/o2web/source/x_component_process_Xform/Select.js +++ b/o2web/source/x_component_process_Xform/Select.js @@ -203,24 +203,29 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect = new Class({ }, _setValue: function(value){ - var p = o2.promiseAll(value).then(function(v){ - if (o2.typeOf(v)=="array") v = v[0]; - if (this.moduleSelectAG){ - this.moduleValueAG = this.moduleSelectAG; - this.moduleSelectAG.then(function(){ - this.__setValue(v); - return v; - }.bind(this)); - }else{ - this.__setValue(v) - } - return v; - }.bind(this)); + if (!!value){ + var p = o2.promiseAll(value).then(function(v){ + if (o2.typeOf(v)=="array") v = v[0]; + if (this.moduleSelectAG){ + this.moduleValueAG = this.moduleSelectAG; + this.moduleSelectAG.then(function(){ + this.__setValue(v); + return v; + }.bind(this)); + }else{ + this.__setValue(v) + } + return v; + }.bind(this)); + + this.moduleValueAG = p; + if (this.moduleValueAG) this.moduleValueAG.then(function(){ + this.moduleValueAG = null; + }.bind(this)); + }else{ + this.__setValue(value); + } - this.moduleValueAG = p; - if (this.moduleValueAG) this.moduleValueAG.then(function(){ - this.moduleValueAG = null; - }.bind(this)); // this.moduleValueAG = o2.AG.all(value).then(function(v){ // if (o2.typeOf(v)=="array") v = v[0]; diff --git a/o2web/source/x_component_process_Xform/Textarea.js b/o2web/source/x_component_process_Xform/Textarea.js index 943740ccb3148f77732b51077b50d7be05407718..4e04f0d34f250b19a02eaf626df07a1782061ddc 100644 --- a/o2web/source/x_component_process_Xform/Textarea.js +++ b/o2web/source/x_component_process_Xform/Textarea.js @@ -24,6 +24,7 @@ MWF.xApplication.process.Xform.Textarea = MWF.APPTextarea = new Class({ _setValue: function(value){ + if (!value) value = ""; var p = o2.promiseAll(value).then(function(v){ if (o2.typeOf(v)=="array") v = v[0]; this._setBusinessData(v);