details: https://code.openbravo.com/erp/devel/pi/rev/a3e91c862ccc
changeset: 22738:a3e91c862ccc
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Mar 21 00:04:15 2014 +0100
summary: [scupgrade] Modified Smartclient 10.0d 2014-02-13 SNAPSHOT to fix:
* Initial grey (non-working) date in isc.Calendar
* Fixed issue 25987: 'Process Definition' -> 'Parameter' tab can be edited again
diffstat:
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
| 14 +++++++--
1 files changed, 11 insertions(+), 3 deletions(-)
diffs (33 lines):
diff -r 5c090bd9178b -r a3e91c862ccc
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
---
a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
Thu Mar 20 16:18:16 2014 +0000
+++
b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
Fri Mar 21 00:04:15 2014 +0100
@@ -5485,10 +5485,18 @@
if(_21){var _37=this.evalViewState(_36,"viewState");if(_37){delete _37.group}
_36="("+isc.Comm.serialize(_37,false)+")"}
this.setViewState(_36)}});isc.evalBoundary;isc.B.push(isc.A.addField=function
isc_ListGrid_addField(_1,_2){return
this.Super("addField",[_1,_2,this.completeFields],arguments)},isc.A.removeField=function
isc_ListGrid_removeField(_1){return
this.Super("removeField",[_1,this.completeFields],arguments)},isc.A.shouldShowCheckboxField=function
isc_ListGrid_shouldShowCheckboxField(){if(this.fieldSourceGrid)return
this.fieldSourceGrid.shouldShowCheckboxField();return(this.selectionAppearance==this.$12c&&this.selectionType!=this.$27r&&!isc.isA.TreeGrid(this))},isc.A.focusInFilterEditor=function
isc_ListGrid_focusInFilterEditor(_1){if(this.filterEditor==null)return;var
_2=_1!=null?this.getColNum(_1):null;this.filterEditor.startEditing(0,_2)},isc.A.filterByEditor=function
isc_ListGrid_filterByEditor(){if(this.filterEditor!=null)this.filterEditor.performAction()},isc.A.bindToDataSource=function
isc_ListGrid_bindToDataSource(_1,_2,_3,_4,_5,_6){var _7=false;var
_8=this.invokeSuper(isc.ListGrid,"b
indToDataSource",_1,_2,_3,_4,_5,_6);if(this.showDetailFields&&_8!=null){for(var
i=0;i<_8.length;i++){var
_10=_8[i];if(_10.showIf==null&&_10.detail==true){_10.showIf=this.$18r}
-if(isc.isA.Number(parseInt(_10.name))&&parseInt(_10.name).toString()==_10.name)
+if(this._isNumberOrArrayProp(_10.name))
{_7=true}
_10.$81f=true}}
-this.$81g=!_7;return _8},isc.A.setFieldState=function
isc_ListGrid_setFieldState(_1){if(this.completeFields==null)this.setFields(this.fields);if(_1==null&&this.fieldState!=null){if(isc.isA.String(this.fieldState)){_1=this.evalViewState(this.fieldState,"fieldState")}else{_1=this.fieldState}
+this.$81g=!_7;return _8},
+isc.A._$emptyArr=[],
+isc.A._isNumberOrArrayProp=function isc_ListGrid__isNumberOrArrayProp(_1) {
+if(this._$emptyArr[_1]!=null)return true;
+if(isc.isA.Number(parseInt(_1))&&
+parseInt(_1).toString()==_1)return true;
+return false;
+},
+isc.A.setFieldState=function
isc_ListGrid_setFieldState(_1){if(this.completeFields==null)this.setFields(this.fields);if(_1==null&&this.fieldState!=null){if(isc.isA.String(this.fieldState)){_1=this.evalViewState(this.fieldState,"fieldState")}else{_1=this.fieldState}
this.completeFields=this.$31y(_1);this.fieldState=null;return}
_1=this.evalViewState(_1,"fieldState")
if(_1){this.completeFields=this.$31y(_1);this.refreshFields()}},isc.A.handleFieldStateChanged=function
isc_ListGrid_handleFieldStateChanged(_1){this.fieldStateChanged();this.handleViewStateChanged();if(this.canSelectCells&&!_1){this.selection.deselectAll();if(this.fields&&this.fields.length!=this.selection.numCols){this.selection.numCols=this.fields.length}}},isc.A.setHilites=function
isc_ListGrid_setHilites(){this.Super("setHilites",arguments);this.handleViewStateChanged()},isc.A.$1024=function
isc_ListGrid__handleHilitesChanged(_1){this.Super("$1024",arguments);if(isc.isA.Function(this.hilitesChanged))this.hilitesChanged()},isc.A.redrawHilites=function
isc_ListGrid_redrawHilites(){this.$25a("redrawHilites")},isc.A.getCheckboxField=function
isc_ListGrid_getCheckboxField(){var
_1=this,_2={width:this.checkboxFieldHSpace+this.$65a(),getAutoFreezePosition:function(){return
_1.getCheckboxFieldPosition()}};isc.addProperties(_2,this.checkboxFieldDefaults,this.checkboxFieldProperties);_2.t
itle=(this.canSelectAll==false||this.selectionType=="single"?isc.nbsp:this.$116w(false,true,false,_2));return
_2},isc.A.getCurrentCheckboxField=function
isc_ListGrid_getCurrentCheckboxField(){var
_1=this.completeFields||this.fields;if(!_1)return null;var
_2=_1.find(this.fieldIdProperty,"_checkboxField");return!_2?null:isc.isAn.Array(_2)?_2[0]:_2},isc.A.$65a=function
isc_ListGrid__getCheckboxFieldImageWidth(){return
this.checkboxFieldImageWidth||this.booleanImageWidth||(isc.CheckboxItem?isc.CheckboxItem.getInstanceProperty("valueIconWidth"):null)},isc.A.$65b=function
isc_ListGrid__getCheckboxFieldImageHeight(){return
this.checkboxFieldImageHeight||this.booleanImageHeight||(isc.CheckboxItem?isc.CheckboxItem.getInstanceProperty("valueIconWidth"):null)},isc.A.isCheckboxField=function
isc_ListGrid_isCheckboxField(_1){if(!_1||!_1.$63f)return false;else return
true},isc.A.getCheckboxFieldPosition=function
isc_ListGrid_getCheckboxFieldPosition(){if(this.fieldSourceGrid)return
this.fieldSour
ceGrid.getCheckboxFieldPosition();if(this.selectionAppearance!="checkbox"||isc.isA.TreeGrid(this))return-1;var
_1=0;if(this.shouldShowRowNumberField())_1++;return
_1},isc.A.getSelectedState=function
isc_ListGrid_getSelectedState(_1){if(!this.selection)return
null;if(!this.dataSource||isc.isAn.emptyObject(this.getDataSource().getPrimaryKeyFields()))
@@ -13320,7 +13328,7 @@
if(!this.isWeekView()&&this.alternateRecordStyles&&_2%2!=0){if(_5==_4.workdayBaseStyle)return
_5;return _5+"Dark"}
if(_4.dayViewSelected()&&_4.showDayLanes&&this.alternateFieldStyles&&_3%2!=0){if(_5==_4.workdayBaseStyle)return
_5;return _5+"Dark"}
return _5},isc.A.getBaseStyle=function
isc_DaySchedule_getBaseStyle(_1,_2,_3){var
_4=this.calendar,_5=_4.getCellDate(_2,_3,this),_6=_5?_4.getDateStyle(_5,_2,_3,this):null,_7=this.isWeekView();if(_6){return
_6}
-if(this.isLabelCol(_3))return
this.labelColumnBaseStyle;if(!_4.showWorkday)return this.baseStyle;var
_8=this.getFieldBody(_3),_9=_3;if(_8==this.body)_9=this.getLocalFieldNum(_3);var
_10=_7?this.getDayFromCol(_9):_4.chosenDate.getDay();var
_11=_7?this.getDateFromCol(_9):_4.chosenDate.duplicate(),_12=_11.duplicate(),_13=_5?_5.duplicate():null,_14=_4.showDayLanes?this.body.getField(_9)[_4.laneNameField]:null;if(_13){var
_15=isc.Time.parseInput(_4.getWorkdayStart(_13,_14)),_16=isc.Time.parseInput(_4.getWorkdayEnd(_13,_14));_11.setHours(_15.getHours());_11.setMinutes(_15.getMinutes());_12.setHours(_16.getHours());_12.setMinutes(_16.getMinutes());var
_17=_4.dateIsWorkday(_13,_14);_13=_13.getTime();if(_17&&_11.getTime()<=_13&&_13<_12.getTime()){return
_4.workdayBaseStyle}else{return this.baseStyle}}else{return
this.baseStyle}},isc.A.clearSelection=function
isc_DaySchedule_clearSelection(){if(this.$53q){var
_1,_2,_3=this.$53q.colNum;if(this.$53q.startRowNum<this.$53q.endRowNum){_1=this.$53q
.startRowNum;_2=this.$53q.endRowNum}else{_1=this.$53q.endRowNum;_2=this.$53q.startRowNum}
+if(this.isLabelCol(_3))return
this.labelColumnBaseStyle;if(!_4.showWorkday)return this.baseStyle;var
_8=this.getFieldBody(_3),_9=_3;if(_8==this.body)_9=this.getLocalFieldNum(_3);var
_10=_7?this.getDayFromCol(_9):_4.chosenDate.getDay();var
_11=_7?this.getDateFromCol(_9):_4.chosenDate.duplicate(),_12=_11.duplicate(),_13=_5?_5.duplicate():null,_14=_4.showDayLanes?this.body.getField(_9)[_4.laneNameField]:null;if(_13){var
_15=isc.Time.parseInput(_4.getWorkdayStart(_13,_14)),_16=isc.Time.parseInput(_4.getWorkdayEnd(_13,_14));_11.setHours(_15.getHours(),_15.getMinutes(),0,0);_12.setHours(_16.getHours(),_16.getMinutes(),0,0);var
_17=_4.dateIsWorkday(_13,_14);_13=_13.getTime();if(_17&&_11.getTime()<=_13&&_13<_12.getTime()){return
_4.workdayBaseStyle}else{return this.baseStyle}}else{return
this.baseStyle}},isc.A.clearSelection=function
isc_DaySchedule_clearSelection(){if(this.$53q){var
_1,_2,_3=this.$53q.colNum;if(this.$53q.startRowNum<this.$53q.endRowNum){_1=this.$53q.startRowNum;_2=this.$53
q.endRowNum}else{_1=this.$53q.endRowNum;_2=this.$53q.startRowNum}
this.$53q=null;for(var
i=_1;i<_2+1;i++){this.refreshCellStyle(i,_3)}}},isc.A.destroyEvents=function
isc_DaySchedule_destroyEvents(){if(!this.body||!this.body.children)return;var
_1=this.body.children.length;while(--_1>=0){var
_2=this.body.children[_1];if(_2){this.body.removeChild(_2);_2.destroy();_2=null}}
this.$128q=null;this.$129c=null;this.$128h=null},isc.A.destroy=function
isc_DaySchedule_destroy(){this.calendar=null;this.destroyEvents(true);if(this.clearZones)this.clearZones();if(this.clearIndicators)this.clearIndicators();this.Super("destroy",arguments)},isc.A.updateEventWindow=function
isc_DaySchedule_updateEventWindow(_1){if(!this.body||!this.body.children)return;var
_2=this.body.children,_3=this.calendar;for(var
i=0;i<_2.length;i++){if(_2[i]&&_2[i].isEventCanvas&&this.areSame(_2[i].event,_1)){_2[i].event=_1;this.sizeEventCanvas(_2[i]);if(_2[i].setDescriptionText)
_2[i].setDescriptionText(_1[_3.descriptionField]);return true}}
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
