diff --git a/view/adminhtml/web/js/lib/knockout/bindings/virtual-foreach.js b/view/adminhtml/web/js/lib/knockout/bindings/virtual-foreach.js index 9f455e58..2c5e909d 100644 --- a/view/adminhtml/web/js/lib/knockout/bindings/virtual-foreach.js +++ b/view/adminhtml/web/js/lib/knockout/bindings/virtual-foreach.js @@ -67,6 +67,7 @@ define([ ///////////////Horizontal Offset//////////////// var timeOffset = viewModel.getOffset(cron, true); cronOffset.left = timeOffset + panelOffset(); + cronOffset.right = cronOffset.left + (cron.timelineWidth || 0); return cronOffset; }; @@ -190,13 +191,21 @@ define([ function isInBounds(cronOffset) { var cTop = cronOffset.top; var cLeft = cronOffset.left; + var cRight = cronOffset.right; if (cTop > topBoundry && cTop <= bottomBoundry) { if (cLeft > leftBoundry && cLeft <= rightBoundry) { return true; } + if (cRight > leftBoundry && cRight <= rightBoundry) { + return true; + } + if (cLeft < leftBoundry && cRight >= rightBoundry) { + return true; + } return false; } + isVerticallyInBounds = false; return false; } diff --git a/view/adminhtml/web/js/timeline/timeline.js b/view/adminhtml/web/js/timeline/timeline.js index eef23b50..144c986a 100644 --- a/view/adminhtml/web/js/timeline/timeline.js +++ b/view/adminhtml/web/js/timeline/timeline.js @@ -116,6 +116,7 @@ define([ } duration = Math.round(duration); duration = duration > minWidth ? duration : minWidth; + job.timelineWidth = duration; return duration; },