details: https://code.openbravo.com/erp/devel/pi/rev/b1b35d6343bf changeset: 15433:b1b35d6343bf user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Feb 10 21:08:15 2012 +0100 summary: Issue 19728: Format js files of org.openbravo.userinterface.selector
details: https://code.openbravo.com/erp/devel/pi/rev/cc337f4d535b changeset: 15434:cc337f4d535b user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Feb 10 21:09:22 2012 +0100 summary: Issue 19728: Format js files of org.openbravo.userinterface.smartclient diffstat: modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/classic-skin-variable.js | 4 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js | 25 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 335 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-link-widget.js | 75 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js | 1715 ++++----- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.userinterface.selector/ob-selector-item-styles.js | 24 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient-labels.js | 406 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 698 ++-- 8 files changed, 1645 insertions(+), 1637 deletions(-) diffs (truncated from 4436 to 300 lines): diff -r 607dccd3524a -r cc337f4d535b modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/classic-skin-variable.js --- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/classic-skin-variable.js Thu Feb 09 14:55:01 2012 +0100 +++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/classic-skin-variable.js Fri Feb 10 21:09:22 2012 +0100 @@ -11,10 +11,10 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2009-2010 Openbravo SLU + * All portions are Copyright (C) 2009-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ */ // Empty file, included for backward compatibility -var isomorphicDir='../web/org.openbravo.userinterface.smartclient/isomorphic/'; \ No newline at end of file +var isomorphicDir = '../web/org.openbravo.userinterface.smartclient/isomorphic/'; \ No newline at end of file diff -r 607dccd3524a -r cc337f4d535b modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js --- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js Thu Feb 09 14:55:01 2012 +0100 +++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js Fri Feb 10 21:09:22 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) 2011 Openbravo SLU + * All portions are Copyright (C) 2011-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -22,13 +22,13 @@ operator: 'equals', valueField: OB.Constants.ID, - init: function() { + init: function () { OB.Datasource.get(this.entity, this); this.Super('init', arguments); }, - + // prevent ids from showing up - mapValueToDisplay : function (value) { + mapValueToDisplay: function (value) { var ret = this.Super('mapValueToDisplay', arguments); if (ret === value) { return ''; @@ -36,7 +36,7 @@ return ret; }, - setDataSource: function(ds) { + setDataSource: function (ds) { var val; this.optionDataSource = ds; if (this.getValue()) { @@ -47,23 +47,20 @@ this.setValue(val); } }, - - filterDataBoundPickList : function (requestProperties, dropCache){ + + filterDataBoundPickList: function (requestProperties, dropCache) { requestProperties = requestProperties || {}; requestProperties.params = requestProperties.params || {}; // on purpose not passing the third boolean param var contextInfo = this.selectorWindow.selector.form.view.getContextInfo(false, true); - + // also add the special ORG parameter if (this.selectorWindow.selector.form.getField('organization')) { - requestProperties.params[OB.Constants.ORG_PARAMETER] = - this.selectorWindow.selector.form.getValue('organization'); + requestProperties.params[OB.Constants.ORG_PARAMETER] = this.selectorWindow.selector.form.getValue('organization'); } else if (contextInfo.inpadOrgId) { requestProperties.params[OB.Constants.ORG_PARAMETER] = contextInfo.inpadOrgId; } - + return this.Super('filterDataBoundPickList', [requestProperties, dropCache]); } - - -}); +}); \ No newline at end of file diff -r 607dccd3524a -r cc337f4d535b 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 Thu Feb 09 14:55:01 2012 +0100 +++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js Fri Feb 10 21:09:22 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) 2011 Openbravo SLU + * All portions are Copyright (C) 2011-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -27,40 +27,40 @@ canDragResize: true, dismissOnEscape: true, showMaximizeButton: true, - + defaultSelectorGridField: { canFreeze: true, canGroupBy: false }, - + initWidget: function () { - var selectorWindow = this; + var selectorWindow = this, + okButton, cancelButton, operator, i; + this.setFilterEditorProperties(this.selectorGridFields); - - var okButton = isc.OBFormButton.create({ + + okButton = isc.OBFormButton.create({ title: OB.I18N.getLabel('OBUISC_Dialog.OK_BUTTON_TITLE'), - click: function(){ + click: function () { selectorWindow.setValueInField(); } }); - var cancelButton = isc.OBFormButton.create({ + cancelButton = isc.OBFormButton.create({ title: OB.I18N.getLabel('OBUISC_Dialog.CANCEL_BUTTON_TITLE'), - click: function(){ + click: function () { selectorWindow.hide(); selectorWindow.selector.focusInItem(); } }); - + OB.Utilities.applyDefaultValues(this.selectorGridFields, this.defaultSelectorGridField); - var operator; if (this.selector.popupTextMatchStyle === 'substring') { operator = 'iContains'; } else { - operator = 'iStartsWith'; + operator = 'iStartsWith'; } - var i; for (i = 0; i < this.selectorGridFields.length; i++) { this.selectorGridFields[i].canSort = (this.selectorGridFields[i].canSort === false ? false : true); if (this.selectorGridFields[i].disableFilter) { @@ -69,14 +69,14 @@ this.selectorGridFields[i].canFilter = true; } } - if(!this.dataSource.fields || !this.dataSource.fields.length || this.dataSource.fields.length===0){ + if (!this.dataSource.fields || !this.dataSource.fields.length || this.dataSource.fields.length === 0) { this.dataSource.fields = this.selectorGridFields; this.dataSource.init(); } this.selectorGrid = isc.OBGrid.create({ - + selector: this.selector, - + dataProperties: { useClientFiltering: false, useClientSorting: false @@ -88,14 +88,14 @@ dataSource: this.dataSource, showFilterEditor: true, sortField: this.displayField, - - onFetchData: function(criteria, requestProperties) { + + onFetchData: function (criteria, requestProperties) { requestProperties = requestProperties || {}; - requestProperties.params = this.getFetchRequestParams(requestProperties.params); + requestProperties.params = this.getFetchRequestParams(requestProperties.params); }, - - getFetchRequestParams: function(params) { - params = params || {}; + + getFetchRequestParams: function (params) { + params = params || {}; // on purpose not sending the third boolean param isc.addProperties(params, this.selector.form.view.getContextInfo(false, true)); @@ -114,13 +114,13 @@ // add field's default filter expressions params.filterClass = 'org.openbravo.userinterface.selector.SelectorDataSourceFilter'; - if(this.getSelectedRecord()) { + if (this.getSelectedRecord()) { params._targetRecordId = this.targetRecordId; } return params; }, - dataArrived: function() { + dataArrived: function () { var record, rowNum; this.Super('dataArrived', arguments); // check if a record has been selected, if @@ -140,11 +140,11 @@ } }, fields: this.selectorGridFields, - recordDoubleClick: function(){ + recordDoubleClick: function () { selectorWindow.setValueInField(); } }); - + this.items = [this.selectorGrid, isc.HLayout.create({ styleName: this.buttonBarStyleName, height: this.buttonBarHeight, @@ -155,35 +155,36 @@ })]; this.Super('initWidget', arguments); }, - - setFilterEditorProperties: function(gridFields){ - var type, selectorWindow = this; - var keyPressFunction = function(item, form, keyName, characterValue){ + + setFilterEditorProperties: function (gridFields) { + var type, selectorWindow = this, + keyPressFunction, clickFunction, i, gridField; + + keyPressFunction = function (item, form, keyName, characterValue) { if (keyName === 'Escape') { selectorWindow.hide(); return false; } return true; }; - - var clickFunction = function(form, item, icon){ + + clickFunction = function (form, item, icon) { item.setValue(null); selectorWindow.selectorGrid.focusInFilterEditor(item); selectorWindow.selectorGrid.filterByEditor(); }; - - var i; + for (i = 0; i < gridFields.length; i++) { - var gridField = gridFields[i]; - + gridField = gridFields[i]; + type = isc.SimpleType.getType(gridField.type); - + if (type.filterEditorType && !gridField.filterEditorType) { gridField.filterEditorType = type.filterEditorType; } - + gridField.canFilter = (gridField.canFilter === false ? false : true); - gridField.filterOnKeypress = (gridField.filterOnKeypress === false ? false : true); + gridField.filterOnKeypress = (gridField.filterOnKeypress === false ? false : true); if (!gridField.filterEditorProperties) { gridField.filterEditorProperties = { @@ -192,25 +193,25 @@ } else { gridField.filterEditorProperties.required = false; } - + gridField.filterEditorProperties.keyPress = keyPressFunction; - + if (!gridField.filterEditorProperties.icons) { gridField.filterEditorProperties.icons = []; } - + gridField.filterEditorProperties.showLabel = false; gridField.filterEditorProperties.showTitle = false; gridField.filterEditorProperties.selectorWindow = selectorWindow; gridField.filterEditorProperties.textMatchStyle = selectorWindow.selector.popupTextMatchStyle; } }, - - closeClick: function() { + + closeClick: function () { this.hide(arguments); }, - hide: function(){ + hide: function () { ------------------------------------------------------------------------------ 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
