diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-03-29 13:32:34 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-03-29 13:32:34 +0200 |
| commit | 5da87c6a322a11f91258a2e6e4e399e6bd920481 (patch) | |
| tree | 44d39076af514a1edf7b63d36df788d53870e7fd /addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext | |
| parent | dc1ad09ede424ac767f35a7586b13080fb15f08f (diff) | |
| parent | be890ed69139aa7b7de8057fe1e9bca20b30378d (diff) | |
[FIX] web_calendar: ensure dhtmlx minical does not set offsetHeight < 0px, IE<9 raise 'Invalid argument.' breaking the view
bzr revid: fme@openerp.com-20120329113234-aj5bpj5ea0h0d2b8
Diffstat (limited to 'addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext')
| -rw-r--r-- | addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js index a6a02b96445..0fa43fc3e0c 100644 --- a/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js +++ b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js @@ -207,7 +207,7 @@ scheduler._render_calendar=function(obj,sd,conf, previous){ if (!previous)
obj.appendChild(d);
- d.childNodes[1].style.height = (d.childNodes[1].childNodes[0].offsetHeight-1)+"px"; // dhx_year_week should have height property so that day dates would get correct position. dhx_year_week height = height of it's child (with the day name)
+ d.childNodes[1].style.height = d.childNodes[1].childNodes[0].offsetHeight <= 0 ? "0px" : (d.childNodes[1].childNodes[0].offsetHeight-1)+"px"; // dhx_year_week should have height property so that day dates would get correct position. dhx_year_week height = height of it's child (with the day name)
/*restore*/ this._cols=temp; this._mode = temp2; this._colsS = temp3; this._min_date=temp4; this._max_date=temp5; scheduler._date = temp6; ts.month_day=temp7;
return d;
|