details: https://code.openbravo.com/erp/devel/pi/rev/609fffb254cf
changeset: 15578:609fffb254cf
user: Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com>
date: Thu Feb 23 10:46:21 2012 +0100
summary: Fixed issue 19403: fields which are drawn as textarea adapts the
height considering the defined rowspan.
When textarea is created, the rowspan of the cell which contains it is checked.
Then, the height of the texarea is calculated to fill the cell space.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js
| 7 +++++
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
| 14 ++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diffs (48 lines):
diff -r 78afc89f1cac -r 609fffb254cf
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
Thu Feb 23 09:52:07 2012 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js
Thu Feb 23 10:46:21 2012 +0100
@@ -28,6 +28,13 @@
selectOnFocus: false,
+ init: function () {
+ if (this.initStyle) {
+ this.initStyle();
+ }
+ this.Super('init', arguments);
+ },
+
isDisabled: function () {
var ret = this.Super('isDisabled', arguments);
if (ret && this.showDisabled) {
diff -r 78afc89f1cac -r 609fffb254cf
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
Thu Feb 23 09:52:07 2012 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
Thu Feb 23 10:46:21 2012 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -68,7 +68,17 @@
isc.OBTextAreaItem.addProperties(isc.addProperties({},
OB.Styles.OBFormField.DefaultTextItem));
isc.OBTextAreaItem.addProperties({
- height: 66
+ initStyle: function () {
+ //To adapt the height this code is used because height: '*' doesn't work
properly (conflicts with OBSectionItem).
+ var rowSpan = 1;
+ var singleRowHeight = this.getHeight();
+ var multipleRowHeight = singleRowHeight + 24; // 24px = title height +
form item padding defined in CSS
+ if (this.rowSpan) {
+ rowSpan = this.rowSpan;
+ }
+ var newHeight = singleRowHeight + (rowSpan - 1) * multipleRowHeight;
+ this.setHeight(newHeight);
+ }
});
isc.OBSpinnerItem.addProperties(isc.addProperties({},
OB.Styles.OBFormField.DefaultTextItem));
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
