Merge branch 'master' into view-modes
This commit is contained in:
commit
f4f97cdb18
@ -303,12 +303,18 @@ export default class Bar {
|
|||||||
(e) =>
|
(e) =>
|
||||||
(timeout = setTimeout(() => {
|
(timeout = setTimeout(() => {
|
||||||
this.show_popup(e.offsetX || e.layerX);
|
this.show_popup(e.offsetX || e.layerX);
|
||||||
|
document.getElementById(
|
||||||
|
`highlight-${task_id}`,
|
||||||
|
).style.display = 'block';
|
||||||
}, 200)),
|
}, 200)),
|
||||||
);
|
);
|
||||||
|
|
||||||
$.on(this.group, 'mouseleave', () => {
|
$.on(this.group, 'mouseleave', () => {
|
||||||
clearTimeout(timeout);
|
clearTimeout(timeout);
|
||||||
this.gantt.popup?.hide?.();
|
this.gantt.popup?.hide?.();
|
||||||
|
|
||||||
|
document.getElementById(`highlight-${task_id}`).style.display =
|
||||||
|
'none';
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -569,6 +569,7 @@ export default class Gantt {
|
|||||||
* @returns Object containing the x-axis distance and date of the current date, or null if the current date is out of the gantt range.
|
* @returns Object containing the x-axis distance and date of the current date, or null if the current date is out of the gantt range.
|
||||||
*/
|
*/
|
||||||
computeGridHighlightDimensions(view_mode) {
|
computeGridHighlightDimensions(view_mode) {
|
||||||
|
|
||||||
const today = new Date();
|
const today = new Date();
|
||||||
if (today < this.gantt_start || today > this.gantt_end) return null;
|
if (today < this.gantt_start || today > this.gantt_end) return null;
|
||||||
let diff_in_units = date_utils.diff(
|
let diff_in_units = date_utils.diff(
|
||||||
@ -610,6 +611,7 @@ export default class Gantt {
|
|||||||
if ($today) {
|
if ($today) {
|
||||||
$today.classList.add('current-date-highlight');
|
$today.classList.add('current-date-highlight');
|
||||||
$today.style.top = +$today.style.top.slice(0, -2) - 4 + 'px';
|
$today.style.top = +$today.style.top.slice(0, -2) - 4 + 'px';
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -827,7 +829,6 @@ export default class Gantt {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bar_wrapper.classList.add('active');
|
bar_wrapper.classList.add('active');
|
||||||
if (this.popup) this.popup.parent.classList.add('hidden');
|
|
||||||
|
|
||||||
if (this.popup) this.popup.parent.classList.add('hidden');
|
if (this.popup) this.popup.parent.classList.add('hidden');
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user