details: /erp/devel/pi/rev/0718ce237165
changeset: 9400:0718ce237165
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Dec 27 10:40:47 2010 +0100
summary: Change event is called directly for list items and not onblur,
Changed from combo to selectitem, no need anymore for specific gridfilter list
editor
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 65 +++++----
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 8 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
| 6 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
| 7 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
| 2 +-
5 files changed, 43 insertions(+), 45 deletions(-)
diffs (181 lines):
diff -r 124d33a63dcb -r 0718ce237165
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Mon Dec 27 09:31:36 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Mon Dec 27 10:40:47 2010 +0100
@@ -27,8 +27,8 @@
// * OBDateTimeItem: FormItem for DateTime
// * OBNumber: FormItem for numbers
// * OBYesNoItem: combo box for yes/no values
-// * OBFKComboBoxItem: combo box for foreign key references
-// * OBListComboBoxItem: combo box for list references
+// * OBFKItem: combo box for foreign key references
+// * OBListItem: combo box for list references
// == OBCheckboxItem ==
// Item used for Openbravo yes/no fields.
@@ -76,14 +76,22 @@
// Form sections
isc.ClassFactory.defineClass('OBSectionItem', SectionItem);
-// == OBListComboBoxItem ==
+// == OBListItem ==
// Combo box for list references
-isc.ClassFactory.defineClass('OBListComboBoxItem', ComboBoxItem);
+isc.ClassFactory.defineClass('OBListItem', SelectItem);
-isc.OBListComboBoxItem.addProperties({
+isc.OBListItem.addProperties({
itemData: null,
+ changed: function() {
+ var ret = this.Super("changed", arguments);
+ if (this.form && this.form.handleItemChange) {
+ this.form.handleItemChange(this);
+ }
+ return ret;
+ },
+
getValueMap: function(){
if (this.itemData) {
return this.itemData;
@@ -93,26 +101,11 @@
});
-// == OBListFilterComboBoxItem ==
-// Combo box for list references used in filter editors, the difference
-// is that always an empty value is added.
-isc.ClassFactory.defineClass('OBListFilterComboBoxItem',
isc.OBListComboBoxItem);
+// == OBFKItem ==
+// Extends SelectItem with suggestion box behavior for foreign key references.
+isc.ClassFactory.defineClass('OBFKItem', SelectItem);
-isc.OBListFilterComboBoxItem.addProperties({
-
- // adds an empty value at the beginning
- getClientPickListData: function(){
- var result = this.Super('getClientPickListData', arguments);
- result.unshift({});
- return result;
- }
-});
-
-// == OBFKComboBoxItem ==
-// Extends ComboBoxItem with suggestion box behavior for foreign key
references.
-isc.ClassFactory.defineClass('OBFKComboBoxItem', ComboBoxItem);
-
-isc.OBFKComboBoxItem.addProperties({
+isc.OBFKItem.addProperties({
selectOnFocus: true,
autoFetchData: false,
completeOnTab: true,
@@ -126,7 +119,15 @@
getDataSource: function(){
return this.getOptionDataSource();
},
-
+
+ changed: function() {
+ var ret = this.Super("changed", arguments);
+ if (this.form && this.form.handleItemChange) {
+ this.form.handleItemChange(this);
+ }
+ return ret;
+ },
+
getOptionDataSource: function(){
if (this.optionDataSource) {
return this.optionDataSource;
@@ -866,9 +867,17 @@
titleClick: function(form, item){
item.focusInItem();
},
+
+ changed: function() {
+ var ret = this.Super("changed", arguments);
+ this._doFICCall = true;
+ return ret;
+ },
+
blur : function (form, item) {
- if (form && form.blurItem) {
- form.blurItem(item);
- }
+ if (form && form.handleItemChange) {
+ form.handleItemChange(this);
+ }
+ this._hasChanged = false;
}
});
diff -r 124d33a63dcb -r 0718ce237165
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Mon Dec 27 09:31:36 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Mon Dec 27 10:40:47 2010 +0100
@@ -166,13 +166,7 @@
}
},
- itemChanged: function(item, newValue) {
- var ret = this.Super("itemChanged", arguments);
- item._doFICCall = true;
- return ret;
- },
-
- blurItem: function(item) {
+ handleItemChange: function(item) {
if (item._doFICCall) {
var i;
for (i = 0; i < this.dynamicCols.length; i++) {
diff -r 124d33a63dcb -r 0718ce237165
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
Mon Dec 27 09:31:36 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
Mon Dec 27 10:40:47 2010 +0100
@@ -75,11 +75,11 @@
errorOrientation: 'left'
};
-isc.OBListComboBoxItem.addProperties(isc.addProperties({},
OB.DefaultPickListStyleProperties));
+isc.OBListItem.addProperties(isc.addProperties({},
OB.DefaultPickListStyleProperties));
-isc.OBListFilterComboBoxItem.addProperties(isc.addProperties({},
OB.DefaultPickListStyleProperties));
+isc.OBListFilterItem.addProperties(isc.addProperties({},
OB.DefaultPickListStyleProperties));
-isc.OBFKComboBoxItem.addProperties(isc.addProperties({},
OB.DefaultPickListStyleProperties));
+isc.OBFKItem.addProperties(isc.addProperties({},
OB.DefaultPickListStyleProperties));
isc.OBYesNoItem.addProperties(isc.addProperties({},
OB.DefaultPickListStyleProperties));
diff -r 124d33a63dcb -r 0718ce237165
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
Mon Dec 27 09:31:36 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
Mon Dec 27 10:40:47 2010 +0100
@@ -37,7 +37,7 @@
@Override
public String getFormEditorType() {
- return "OBListComboBoxItem";
+ return "OBListItem";
}
@Override
@@ -56,11 +56,6 @@
}
@Override
- public String getFilterEditorType() {
- return "OBListFilterComboBoxItem";
- }
-
- @Override
public String getFilterEditorProperties(Field field) {
return ", filterOnKeypress: true" + super.getFilterEditorProperties(field);
}
diff -r 124d33a63dcb -r 0718ce237165
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
Mon Dec 27 09:31:36 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
Mon Dec 27 10:40:47 2010 +0100
@@ -37,7 +37,7 @@
@Override
public String getFormEditorType() {
- return "OBFKComboBoxItem";
+ return "OBFKItem";
}
@Override
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
