details: https://code.openbravo.com/erp/devel/pi/rev/48e8f481dcfc
changeset: 13631:48e8f481dcfc
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Aug 31 16:36:41 2011 +0200
summary: Fixed some code formatting
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js
| 47 ++++-----
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
| 4 +-
2 files changed, 25 insertions(+), 26 deletions(-)
diffs (78 lines):
diff -r 14d6a595b956 -r 48e8f481dcfc
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js
Wed Aug 31 15:51:58 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js
Wed Aug 31 16:36:41 2011 +0200
@@ -175,9 +175,7 @@
}
};
-isc.OBDateItem.addProperties(OB.DateItemProperties,
- {
-
+isc.OBDateItem.addProperties(OB.DateItemProperties, {
validateOnExit: true,
init: function() {
@@ -205,28 +203,27 @@
},
validateOBDateItem: function(value){
- var dateValue = OB.Utilities.Date.OBToJS(value, this.dateFormat);
- var isValid = true;
- if (this.getValue() && dateValue === null) {
- isValid = false;
- }
- var isRequired = this.required;
- if (isValid === false) {
- return false;
- } else if (isRequired === true && value === null) {
- return false;
- }
- return true;
- },
-
- validators: [{
- type: 'custom',
- condition: function(item, validator, value){
- return item.validateOBDateItem(value);
- }
- }]
- }
-);
+ var dateValue = OB.Utilities.Date.OBToJS(value, this.dateFormat);
+ var isValid = true;
+ if (this.getValue() && dateValue === null) {
+ isValid = false;
+ }
+ var isRequired = this.required;
+ if (isValid === false) {
+ return false;
+ } else if (isRequired === true && value === null) {
+ return false;
+ }
+ return true;
+ },
+
+ validators: [{
+ type: 'custom',
+ condition: function(item, validator, value){
+ return item.validateOBDateItem(value);
+ }
+ }]
+});
OB.I18N.getLabel('OBUIAPP_InvalidValue', null, isc.OBDateItem,
'invalidValueLabel');
OB.I18N.getLabel('OBUISC_Validator.requiredField', null, isc.OBDateItem,
'requiredValueLabel');
diff -r 14d6a595b956 -r 48e8f481dcfc
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
Wed Aug 31 15:51:58 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
Wed Aug 31 16:36:41 2011 +0200
@@ -197,7 +197,9 @@
this.rangeItem.name = this.name;
// this call super.init
- this.doInit();
+ if (this.doInit) {
+ this.doInit();
+ }
},
blurValue: function() {
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
