details: https://code.openbravo.com/erp/devel/pi/rev/5e3903a17a28
changeset: 18268:5e3903a17a28
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Oct 23 14:10:28 2012 +0200
summary: Related to issue 19728: Do more JS code formatting
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
| 17 ++++-----
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js
| 2 +-
5 files changed, 12 insertions(+), 13 deletions(-)
diffs (86 lines):
diff -r 3ae1a7bf1d80 -r 5e3903a17a28
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
Mon Oct 22 13:23:13 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
Tue Oct 23 14:10:28 2012 +0200
@@ -54,7 +54,7 @@
// for foreign key fields we only support like/contains/substring
// so force that
this.textMatchStyle = this.overrideTextMatchStyle;
-
+
// the data from the datasource will contain the id and the identifier
// the value for the filter and the display are the same: the identifier
this.displayField = OB.Constants.IDENTIFIER;
diff -r 3ae1a7bf1d80 -r 5e3903a17a28
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
Mon Oct 22 13:23:13 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
Tue Oct 23 14:10:28 2012 +0200
@@ -30,8 +30,8 @@
filterOnKeypress: true,
addUnknownValues: false,
- defaultToFirstOption: false,
-
+ defaultToFirstOption: false,
+
multiple: true,
multipleAppearance: 'picklist',
multipleValueSeparator: ' or ',
@@ -44,17 +44,16 @@
delete ret[0].width;
return ret;
},
-
+
// overridden to prevent selection of first item
- selectDefaultItem: function() {
- },
-
- showPickList: function() {
+ selectDefaultItem: function () {},
+
+ showPickList: function () {
var ret = this.Super('showPickList', arguments);
-
+
this.selectItemFromValue(this.getValue());
},
-
+
// note: can't override changed as it is used by the filter editor
// itself, see the RecordEditor source code and the changed event
change: function (form, item, value, oldValue) {
diff -r 3ae1a7bf1d80 -r 5e3903a17a28
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Mon Oct 22 13:23:13 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Tue Oct 23 14:10:28 2012 +0200
@@ -976,7 +976,7 @@
setViewState: function (state) {
var localState, i, fld, hasSummaryFunction;
-
+
localState = this.evalViewState(state, 'viewState');
// strange case, sometimes need to call twice
diff -r 3ae1a7bf1d80 -r 5e3903a17a28
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
Mon Oct 22 13:23:13 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
Tue Oct 23 14:10:28 2012 +0200
@@ -1177,7 +1177,7 @@
}
if (increment < 0) {
// previous, pick the last from the group
- newRecord = newRecord.groupMembers[newRecord.groupMembers.length -1];
+ newRecord = newRecord.groupMembers[newRecord.groupMembers.length - 1];
newRowNum = this.viewGrid.getRecordIndex(newRecord);
} else {
// next, pick the first from the group
diff -r 3ae1a7bf1d80 -r 5e3903a17a28
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js
Mon Oct 22 13:23:13 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js
Tue Oct 23 14:10:28 2012 +0200
@@ -122,7 +122,7 @@
var isClassicEnvironment = OB.Utilities.useClassicMode(item.windowId);
var selectedView = isc.addProperties({}, item);
if (item.tabId) {
- selectedView = OB.Utilities.openView(item.windowId, item.tabId,
item.title, null, null, item.icon, item.readOnly,
item.singleRecord,null,item.editOrDeleteOnly);
+ selectedView = OB.Utilities.openView(item.windowId, item.tabId,
item.title, null, null, item.icon, item.readOnly, item.singleRecord, null,
item.editOrDeleteOnly);
selectedView.type = item.type;
selectedView.icon = item.icon;
if (selectedView) {
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
