details: https://code.openbravo.com/erp/devel/pi/rev/5486b033add8 changeset: 13748:5486b033add8 user: Martin Taal <martin.taal <at> openbravo.com> date: Sun Sep 11 14:54:35 2011 +0200 summary: Related to issue 18470: Performance: generate smaller javascript for a window, improve view generation performance Removed commented lines
details: https://code.openbravo.com/erp/devel/pi/rev/c0e7fedd7966 changeset: 13749:c0e7fedd7966 user: Martin Taal <martin.taal <at> openbravo.com> date: Sun Sep 11 14:55:11 2011 +0200 summary: Change to allow usage of Smartclient sourcecode diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js | 7 ++++++- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java | 6 ------ modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diffs (57 lines): diff -r 6d4e82df2d00 -r c0e7fedd7966 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js Sat Sep 10 13:02:22 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js Sun Sep 11 14:55:11 2011 +0200 @@ -47,5 +47,10 @@ // hack until this gets answered: // http://forums.smartclient.com/showthread.php?p=61621#post61621 // to solve this: https://issues.openbravo.com/view.php?id=16327 -isc.ListGrid.getPrototype().$309.OBPopUpTextAreaItem = true; +if (isc.ListGrid.getPrototype()._popUpTextAreaEditorTypes) { + // handle case when loading source code + isc.ListGrid.getPrototype()._popUpTextAreaEditorTypes.OBPopUpTextAreaItem = true; +} else if (isc.ListGrid.getPrototype().$309) { + isc.ListGrid.getPrototype().$309.OBPopUpTextAreaItem = true; +} diff -r 6d4e82df2d00 -r c0e7fedd7966 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java Sat Sep 10 13:02:22 2011 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java Sun Sep 11 14:55:11 2011 +0200 @@ -115,8 +115,6 @@ JSONObject o = new JSONObject(fieldProperties); if (field.isDisplayed() != null && field.isDisplayed()) { o.put("width", "50%"); - } else { - // o.put("width", ""); } return o.toString(); } catch (Exception e) { // ignore @@ -130,8 +128,6 @@ JSONObject o = new JSONObject(super.getFieldProperties(field, getValueFromSession)); if (field.isDisplayed() != null && field.isDisplayed()) { o.put("width", "50%"); - } else { - // o.put("width", ""); } // If a column has a numeric reference, and is required, and doesn't have a default, then // the default '0' is set @@ -143,8 +139,6 @@ jsonObject.put("classicValue", 0); if (field.isDisplayed() != null && field.isDisplayed()) { o.put("width", "50%"); - } else { - // o.put("width", ""); } return jsonObject.toString(); } diff -r 6d4e82df2d00 -r c0e7fedd7966 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java Sat Sep 10 13:02:22 2011 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java Sun Sep 11 14:55:11 2011 +0200 @@ -129,7 +129,7 @@ */ public String getFieldProperties(Field field) { if (field != null && field.isDisplayed() != null && !field.isDisplayed()) { - return ""; // {width: ''}"; // Not displayed fields use HiddenItem + return ""; // Not displayed fields use HiddenItem } return ""; } ------------------------------------------------------------------------------ Using storage to extend the benefits of virtualization and iSCSI Virtualization increases hardware utilization and delivers a new level of agility. Learn what those decisions are and how to modernize your storage and backup environments for virtualization. http://www.accelacomm.com/jaw/sfnl/114/51434361/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
