holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar - Planner view: Fix time grid lines did not reach all the way to the end

Browse Source
This commit is contained in:
nathangray 2017-03-03 09:07:16 -07:00
parent e649793aee
commit 90e537e1fa
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/js/et2_widget_planner.js
View File

@ -1890,6 +1890,8 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
// Something's in progress, skip // Something's in progress, skip
if(!this.doInvalidate) return; if(!this.doInvalidate) return;
this.grid.height(0);
var id_list = typeof id === 'undefined' ? Object.keys(this.cache) : [id]; var id_list = typeof id === 'undefined' ? Object.keys(this.cache) : [id];
for(var i = 0; i < id_list.length; i++) for(var i = 0; i < id_list.length; i++)
{ {
@ -1908,6 +1910,11 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
break; break;
} }
} }
// Updating the row may push things longer, update length
// Add 1 to keep the scrollbar, otherwise we need to recalculate the
// header widths too.
this.grid.height(this.rows[0].scrollHeight+1);
}, },
/** /**
@ -2365,6 +2372,8 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
this.div.css('height', this.options.height); this.div.css('height', this.options.height);
// Set height for rows // Set height for rows
this.rows.height(this.div.height() - this.headers.outerHeight()); this.rows.height(this.div.height() - this.headers.outerHeight());
this.grid.height(this.rows[0].scrollHeight);
} }
});}).call(this); });}).call(this);
et2_register_widget(et2_calendar_planner, ["calendar-planner"]); et2_register_widget(et2_calendar_planner, ["calendar-planner"]);