details: https://code.openbravo.com/erp/devel/pi/rev/f645c89d74af
changeset: 13847:f645c89d74af
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Sep 28 07:05:00 2011 +0200
summary: Remove workaround, repair styling after SC upgrade
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
| 1 +
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
| 35 +---------
2 files changed, 2 insertions(+), 34 deletions(-)
diffs (63 lines):
diff -r 3aaec7a4477c -r f645c89d74af
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
Wed Sep 28 07:01:20 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
Wed Sep 28 07:05:00 2011 +0200
@@ -101,6 +101,7 @@
controlStyle: 'OBFormFieldSelectControl',
pickerIconStyle: 'OBFormFieldSelectPickerIcon',
pickListBaseStyle: 'OBFormFieldPickListCell',
+ pendingTextBoxStyle: null,
// tallbasestyle is used when the cellheight is different
// from the standard
pickListTallBaseStyle: 'OBFormFieldPickListCell',
diff -r 3aaec7a4477c -r f645c89d74af
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
---
a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
Wed Sep 28 07:01:20 2011 +0200
+++
b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
Wed Sep 28 07:05:00 2011 +0200
@@ -66,23 +66,6 @@
isc.StaticTextItem.getPrototype().getCanFocus = function() {return false;};
-isc.StaticTextItem.addProperties({
- // workaround for this:
- // http://forums.smartclient.com/showthread.php?p=73173
- mapValueToDisplay : function (internalValue, a,b,c,d) {
- var value = this.invokeSuper(isc.StaticTextItem, "mapValueToDisplay",
- internalValue, a,b,c,d);
- var asHTML = this.escapeHTML || this.outputAsHTML || this.asHTML;
-
- // Don't escape unless that's actually the data value!
- if (asHTML && (internalValue === null || internalValue === isc.emptyString)
- && value === ' ') {
- return value;
- }
- return this.Super('mapValueToDisplay', arguments);
- }
-});
-
isc.Layout.addProperties({
destroyAndRemoveMembers: function(toDestroy) {
@@ -100,23 +83,7 @@
});
isc.TextItem.addProperties({
-
- // see this post:
- // http://forums.smartclient.com/showthread.php?p=73453#post73453
- shouldSelectOnFocus : function () {
- var undef, selectOnFocus = this.selectOnFocus;
- if (selectOnFocus === undef && this.form) {
- selectOnFocus = this.form.selectOnFocus;
- }
- if (selectOnFocus) {
- if (isc.EH.isMouseEvent()) {
- selectOnFocus = false;
- }
- }
- return selectOnFocus;
- },
-
-
+
// see comments in super type for useDisabledEventMask
// http://forums.smartclient.com/showthread.php?p=70160#post70160
// https://issues.openbravo.com/view.php?id=17936
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
