details: https://code.openbravo.com/erp/devel/pi/rev/f8f8c7f0b83c
changeset: 17584:f8f8c7f0b83c
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Aug 01 11:43:33 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-list.js
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
| 2 +-
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-window.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
| 20 +++++----
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
| 10 +++--
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
| 3 +-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 8 ++--
8 files changed, 29 insertions(+), 24 deletions(-)
diffs (187 lines):
diff -r b0701ee55593 -r f8f8c7f0b83c
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js
Wed Aug 01 10:54:53 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js
Wed Aug 01 11:43:33 2012 +0200
@@ -140,11 +140,11 @@
if (this.valueMap && this.valueMap[value]) {
return this.valueMap[value];
}
-
+
if (ret === value && this.isDisabled()) {
return '';
}
-
+
// don't update the valuemap if the value is null or undefined
if (ret === value && value) {
if (!this.valueMap) {
@@ -158,7 +158,7 @@
return ret;
},
- mapDisplayToValue: function(value) {
+ mapDisplayToValue: function (value) {
if (value === '') {
return null;
}
diff -r b0701ee55593 -r f8f8c7f0b83c
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
Wed Aug 01 10:54:53 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
Wed Aug 01 11:43:33 2012 +0200
@@ -579,7 +579,7 @@
}
return ret;
},
-
+
// = exportData =
// The exportData function exports the data of the grid to a file. The user
will
// be presented with a save-as dialog.
diff -r b0701ee55593 -r f8f8c7f0b83c
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
Wed Aug 01 10:54:53 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Wed Aug 01 11:43:33 2012 +0200
@@ -551,7 +551,7 @@
if (this.filterEditor && this.filterEditor.getEditForm() &&
this.filterEditor.getEditForm().getFocusItem()) {
this.filterEditor.getEditForm().getFocusItem().hasFocus = false;
}
-
+
this.deleteSelectedParentRecordFilter(localState);
this.Super('setViewState', ['(' + isc.Comm.serialize(localState, false)
+ ')']);
diff -r b0701ee55593 -r f8f8c7f0b83c
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
Wed Aug 01 10:54:53 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
Wed Aug 01 11:43:33 2012 +0200
@@ -410,7 +410,7 @@
return 1;
});
}
-
+
// restore focus as the focusitem may have been hidden now
// https://issues.openbravo.com/view.php?id=21249
this.setFocusInView();
diff -r b0701ee55593 -r f8f8c7f0b83c
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
Wed Aug 01 10:54:53 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
Wed Aug 01 11:43:33 2012 +0200
@@ -102,28 +102,30 @@
});
OB.TestRegistry.register('org.openbravo.client.application.process.pickandexecute.Grid',
this);
-
+
this.editFormProperties = {
view: this.view.parentWindow.activeView
};
-
+
this.Super('initWidget', arguments);
},
-
+
// when starting row editing make sure that the current
// value and identifier are part of a valuemap
// so that the combo shows the correct value without
// loading it from the backend
- rowEditorEnter: function(record, editValues, rowNum) {
- var i = 0, editRecord = this.getEditedRecord(rowNum), gridFld, identifier,
formFld, value, form = this.getEditForm();
-
+ rowEditorEnter: function (record, editValues, rowNum) {
+ var i = 0,
+ editRecord = this.getEditedRecord(rowNum),
+ gridFld, identifier, formFld, value, form = this.getEditForm();
+
if (editRecord) {
// go through the fields and set the edit values
- for (i = 0; i < this.getFields().length;i++) {
+ for (i = 0; i < this.getFields().length; i++) {
gridFld = this.getFields()[i];
formFld = form.getField(gridFld.name);
value = editRecord[gridFld.name];
- identifier = editRecord[gridFld.name + OB.Constants.FIELDSEPARATOR +
OB.Constants.IDENTIFIER];
+ identifier = editRecord[gridFld.name + OB.Constants.FIELDSEPARATOR +
OB.Constants.IDENTIFIER];
if (value && identifier) {
if (formFld.setEntry) {
formFld.setEntry(value, identifier);
@@ -139,7 +141,7 @@
}
return this.Super('rowEditorEnter', arguments);
},
-
+
selectionChanged: function (record, state) {
var recordIdx;
diff -r b0701ee55593 -r f8f8c7f0b83c
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Wed Aug 01 10:54:53 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Wed Aug 01 11:43:33 2012 +0200
@@ -622,14 +622,16 @@
//
updateButtonState: function (noSetSession, changeEvent) {
var me = this,
- isActiveTab = false;
+ isActiveTab = false;
if (this.view && this.view.activeBar && this.view.activeBar.styleName ===
'OBViewActive') {
isActiveTab = true;
}
this.fireOnPause('updateButtonState', function () {
- //Temporary hack to fix issue
https://issues.openbravo.com/view.php?id=20825
- if ((me.view.tabId === '160' || me.view.tabId ===
'FF8080812F213146012F2135BC25000E') && isActiveTab){ //corner case: 160 --> G/L
Journal and FF8080812F213146012F2135BC25000E --> Transaction (Financial
Account child)
- setTimeout(function() { me.pausedUpdateButtonState(noSetSession,
changeEvent); }, 1000);
+ //Temporary hack to fix issue
https://issues.openbravo.com/view.php?id=20825
+ if ((me.view.tabId === '160' || me.view.tabId ===
'FF8080812F213146012F2135BC25000E') && isActiveTab) { //corner case: 160 -->
G/L Journal and FF8080812F213146012F2135BC25000E --> Transaction (Financial
Account child)
+ setTimeout(function () {
+ me.pausedUpdateButtonState(noSetSession, changeEvent);
+ }, 1000);
}
me.pausedUpdateButtonState(noSetSession, changeEvent);
});
diff -r b0701ee55593 -r f8f8c7f0b83c
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
---
a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
Wed Aug 01 10:54:53 2012 +0200
+++
b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
Wed Aug 01 11:43:33 2012 +0200
@@ -825,7 +825,8 @@
},
setAdminMode: function (level, levelValue) {
- var leftColumn = this.leftColumnLayout, levelLabel, levelValueLabel;
+ var leftColumn = this.leftColumnLayout,
+ levelLabel, levelValueLabel;
this.adminMode = true;
this.portalLayout.sendEvents = false;
diff -r b0701ee55593 -r f8f8c7f0b83c
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
---
a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
Wed Aug 01 10:54:53 2012 +0200
+++
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
Wed Aug 01 11:43:33 2012 +0200
@@ -612,7 +612,7 @@
moduleId: this.form.view.moduleId
});
}
-
+
// also add the special ORG parameter
if (requestProperties.params.inpadOrgId) {
requestProperties.params[OB.Constants.ORG_PARAMETER] =
requestProperties.params.inpadOrgId;
@@ -705,13 +705,13 @@
return ret;
},
- mapDisplayToValue: function(value) {
+ mapDisplayToValue: function (value) {
if (value === '') {
return null;
}
return this.Super('mapDisplayToValue', arguments);
},
-
+
destroy: function () {
// Explicitly destroy the selector window to avoid memory leaks
if (this.selectorWindow) {
@@ -728,7 +728,7 @@
isc.OBSelectorLinkItem.addProperties({
canFocus: true,
- showFocused: true,
+ showFocused: true,
wrap: false,
clipValue: true,
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
