details: https://code.openbravo.com/erp/devel/pi/rev/dd9596bfd555
changeset: 25592:dd9596bfd555
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Dec 23 11:18:30 2014 +0100
summary: Related to issue 19728: Do more JS code formatting
diffstat:
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js
| 85 ++++-----
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
| 20 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js
| 2 +-
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
| 60 +++---
6 files changed, 85 insertions(+), 86 deletions(-)
diffs (truncated from 388 to 300 lines):
diff -r c17cea920ecb -r dd9596bfd555
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js
---
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js
Tue Dec 23 10:00:03 2014 +0100
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js
Tue Dec 23 11:18:30 2014 +0100
@@ -102,18 +102,16 @@
var processId = '154CB4F9274A479CB38A285E16984539',
grid = me.grid,
record = me.record,
- standardWindow = grid.view.parentWindow.view.standardWindow,
- process,
- callback,
- bankStatementLineId = me.record.id,
+ standardWindow = grid.view.parentWindow.view.standardWindow,
+ process, callback, bankStatementLineId = me.record.id,
updated = new Date(),
view = me.grid.view;
- updated.setTime(me.record.bslUpdated.getTime());
- callback = function (response, data, request) {
- view.onRefreshFunction(view);
- if (data && data.message && data.message.severity === 'error') {
- view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR,
data.message.title, data.message.text);
- }else{
+ updated.setTime(me.record.bslUpdated.getTime());
+ callback = function (response, data, request) {
+ view.onRefreshFunction(view);
+ if (data && data.message && data.message.severity === 'error') {
+ view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR,
data.message.title, data.message.text);
+ } else {
var process = standardWindow.openProcess({
callerField: me,
paramWindow: true,
@@ -125,11 +123,12 @@
},
windowTitle:
OB.I18N.getLabel('APRM_MATCHTRANSACTION_SEARCH_BUTTON', [this.title])
});
- }
- };
-
OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.CheckRecordChangedActionHandler',
{
- bankStatementLineId: bankStatementLineId, updated: updated
- }, {}, callback);
+ }
+ };
+
OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.CheckRecordChangedActionHandler',
{
+ bankStatementLineId: bankStatementLineId,
+ updated: updated
+ }, {}, callback);
}
});
@@ -141,33 +140,32 @@
var processId = 'E68790A7B65F4D45AB35E2BAE34C1F39',
grid = me.grid,
record = me.record,
- standardWindow = grid.view.parentWindow.view.standardWindow,
- process,
- callback,
- bankStatementLineId = me.record.id,
+ standardWindow = grid.view.parentWindow.view.standardWindow,
+ process, callback, bankStatementLineId = me.record.id,
updated = new Date(),
view = me.grid.view;
- updated.setTime(me.record.bslUpdated.getTime());
- callback = function (response, data, request) {
- view.onRefreshFunction(view);
- if (data && data.message && data.message.severity === 'error') {
- view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR,
data.message.title, data.message.text);
- }else{
- process = standardWindow.openProcess({
- callerField: me,
- paramWindow: true,
- processId: processId,
- windowId: grid.view.windowId,
- externalParams: {
- bankStatementLineId: me.record.id
- },
- windowTitle:
OB.I18N.getLabel('APRM_MATCHTRANSACTION_ADD_BUTTON', [this.title])
- });
- }
- };
-
OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.CheckRecordChangedActionHandler',
{
- bankStatementLineId: bankStatementLineId, updated: updated
- }, {}, callback);
+ updated.setTime(me.record.bslUpdated.getTime());
+ callback = function (response, data, request) {
+ view.onRefreshFunction(view);
+ if (data && data.message && data.message.severity === 'error') {
+ view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR,
data.message.title, data.message.text);
+ } else {
+ process = standardWindow.openProcess({
+ callerField: me,
+ paramWindow: true,
+ processId: processId,
+ windowId: grid.view.windowId,
+ externalParams: {
+ bankStatementLineId: me.record.id
+ },
+ windowTitle:
OB.I18N.getLabel('APRM_MATCHTRANSACTION_ADD_BUTTON', [this.title])
+ });
+ }
+ };
+
OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.CheckRecordChangedActionHandler',
{
+ bankStatementLineId: bankStatementLineId,
+ updated: updated
+ }, {}, callback);
}
});
@@ -177,10 +175,10 @@
originalPrompt: OB.I18N.getLabel('APRM_MATCHTRANSACTION_DELETE_BUTTON'),
prompt: OB.I18N.getLabel('APRM_MATCHTRANSACTION_DELETE_BUTTON'),
action: function () {
- var callback, bankStatementLineId = me.record.id,
+ var callback, bankStatementLineId = me.record.id,
updated = new Date(),
view = me.grid.view;
- updated.setTime(me.record.bslUpdated.getTime());
+ updated.setTime(me.record.bslUpdated.getTime());
callback = function (response, data, request) {
view.onRefreshFunction(view);
if (data && data.message && data.message.severity === 'error') {
@@ -188,7 +186,8 @@
}
};
OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.UnMatchTransactionActionHandler',
{
- bankStatementLineId: bankStatementLineId, updated: updated
+ bankStatementLineId: bankStatementLineId,
+ updated: updated
}, {}, callback);
}
});
diff -r c17cea920ecb -r dd9596bfd555
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
Tue Dec 23 10:00:03 2014 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
Tue Dec 23 11:18:30 2014 +0100
@@ -55,7 +55,7 @@
value = this.getValue();
if (value && value.length > 0) {
for (i = 0; i < value.length; i++) {
- if (value[i].indexOf("==") === 0) {
+ if (value[i].indexOf('==') === 0) {
value[i] = value[i].substring(2, value[i].length);
}
}
diff -r c17cea920ecb -r dd9596bfd555
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js
Tue Dec 23 10:00:03 2014 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js
Tue Dec 23 11:18:30 2014 +0100
@@ -442,7 +442,7 @@
},
dataArrived: function (startRow, endRow) {
- // reset noDataEmptyMessage to prevent showing "loading..."
indefinitely if the datasource does not return any data
+ // reset noDataEmptyMessage to prevent showing "loading..." indefinitely
if the datasource does not return any data
this.noDataEmptyMessage = '<span class="' + this.emptyMessageStyle + '">'
+ OB.I18N.getLabel('OBUIAPP_NoDataInGrid') + '</span>';
this.resetEmptyMessage();
if (this.actionAfterDataArrived) {
diff -r c17cea920ecb -r dd9596bfd555
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
Tue Dec 23 10:00:03 2014 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
Tue Dec 23 11:18:30 2014 +0100
@@ -90,11 +90,11 @@
selectedRecordsLength = selectedRecords.length,
editedRecord = null,
storageBin = record.storageBin,
- i;
+ i;
//Cheking available stock
- if (storageBin === null){
- item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null,
OB.I18N.getLabel('OBUIAPP_RM_NotAvailableStock', [record.rMOrderNo]));
- return false;
+ if (storageBin === null) {
+ item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null,
OB.I18N.getLabel('OBUIAPP_RM_NotAvailableStock', [record.rMOrderNo]));
+ return false;
}
// check value is positive and below available qty and pending qty
if (value === null || value < 0 || value > record.pending || value >
record.availableQty) {
@@ -116,7 +116,7 @@
}
}
}
-
+
return true;
};
@@ -134,11 +134,11 @@
editedRecord = null,
i;
if (state) {
- //Cheking available stock
- if (storageBin === null){
- grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null,
OB.I18N.getLabel('OBUIAPP_RM_NotAvailableStock', [record.rMOrderNo]));
- return false;
- }
+ //Cheking available stock
+ if (storageBin === null) {
+ grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null,
OB.I18N.getLabel('OBUIAPP_RM_NotAvailableStock', [record.rMOrderNo]));
+ return false;
+ }
// calculate already shipped qty on grid
for (i = 0; i < selectedRecords.length; i++) {
editedRecord = isc.addProperties({}, selectedRecords[i],
grid.getEditedRecord(selectedRecords[i]));
diff -r c17cea920ecb -r dd9596bfd555
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js
Tue Dec 23 10:00:03 2014 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js
Tue Dec 23 11:18:30 2014 +0100
@@ -140,6 +140,6 @@
OB.Utilities.Action.set('refreshGrid', function (paramObj) {
var processView = paramObj._processView;
if (processView && processView.buttonOwnerView &&
processView.buttonOwnerView.viewGrid) {
- processView.buttonOwnerView.viewGrid.refreshGrid();
+ processView.buttonOwnerView.viewGrid.refreshGrid();
}
});
\ No newline at end of file
diff -r c17cea920ecb -r dd9596bfd555
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
Tue Dec 23 10:00:03 2014 +0100
+++
b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
Tue Dec 23 11:18:30 2014 +0100
@@ -35,7 +35,7 @@
compareDates: function (date1, date2, fieldName, otherFieldName) {
var field = this.getField(fieldName),
otherField = otherFieldName ? this.getField(otherFieldName) : null;
- if ((field && (field.type === "datetime" || field.type === "_id_24")) ||
(otherField && (otherField.type === "datetime" || otherField.type ===
"_id_24"))) {
+ if ((field && (field.type === 'datetime' || field.type === '_id_24')) ||
(otherField && (otherField.type === 'datetime' || otherField.type ===
'_id_24'))) {
return Date.compareDates(date1, date2);
} else {
return Date.compareLogicalDates(date1, date2);
@@ -262,7 +262,7 @@
opIndex = isc.DynamicForm.getOperatorIndex(),
validOps = isc.getKeys(opIndex),
result = {
- operator: "and",
+ operator: 'and',
criteria: []
},
crit = result.criteria,
@@ -278,7 +278,7 @@
}
if (!isc.isA.String(value)) {
- value += "";
+ value += '';
}
var tempOps, tempOp;
@@ -295,28 +295,28 @@
var field, insensitive = defOp.caseInsensitive;
var partIndex, parts, partCrit, part;
- if (isValidLogicType && value.contains(" and ")) {
- valueParts = value.split(" and ");
- } else if (isValidLogicType && value.contains(" or ")) {
- valueParts = value.split(" or ");
- result.operator = "or";
- } else if (value.contains("...")) {
- valueParts = value.split("...");
+ if (isValidLogicType && value.contains(' and ')) {
+ valueParts = value.split(' and ');
+ } else if (isValidLogicType && value.contains(' or ')) {
+ valueParts = value.split(' or ');
+ result.operator = 'or';
+ } else if (value.contains('...')) {
+ valueParts = value.split('...');
if (valueParts.length === 2) {
- tempOps = opIndex["..."];
+ tempOps = opIndex['...'];
if (tempOps) {
- tempOp = (insensitive ? tempOps.find("caseInsensitive", true) :
tempOps[0]);
+ tempOp = (insensitive ? tempOps.find('caseInsensitive', true) :
tempOps[0]);
}
field = ds ? ds.getField(fieldName) : null;
- if (field && isc.SimpleType.inheritsFrom(field.type, "date")) {
+ if (field && isc.SimpleType.inheritsFrom(field.type, 'date')) {
valueParts[0] = new Date(Date.parse(valueParts[0]));
valueParts[0].logicalDate = true;
valueParts[1] = new Date(Date.parse(valueParts[1]));
valueParts[1].logicalDate = true;
- } else if (field && field.type === "text") {
+ } else if (field && field.type === 'text') {
if (!valueParts[1].endsWith(this._betweenInclusiveEndCrit)) {
valueParts[1] += this._betweenInclusiveEndCrit;
@@ -334,7 +334,7 @@
valueParts = [value];
}
- var skipTheseOps = [" and ", " or "];
+ var skipTheseOps = [' and ', ' or '];
for (i = 0; i < valueParts.length; i++) {
var key, valuePart = valueParts[i],
@@ -343,7 +343,7 @@
};
field = ds ? ds.getField(fieldName) : null;
- var isDateField = (field ? field &&
isc.SimpleType.inheritsFrom(field.type, "date") : false),
+ var isDateField = (field ? field &&
isc.SimpleType.inheritsFrom(field.type, 'date') : false),
valueHasExpression = false;
for (key in opIndex) {
@@ -356,12 +356,12 @@
wildCard = false,
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
