From c137112bf5e2044e174b4094a326539280189c22 Mon Sep 17 00:00:00 2001 From: Lewis B Date: Thu, 15 Feb 2018 22:29:26 +1000 Subject: [PATCH] Allow normal page scrolling over timeline (#3818) --- lib/timeline/Core.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/timeline/Core.js b/lib/timeline/Core.js index 597fb753..b9f5d57f 100644 --- a/lib/timeline/Core.js +++ b/lib/timeline/Core.js @@ -204,9 +204,12 @@ Core.prototype._create = function (container) { deltaX = event.deltaX; } - // prevent scrolling when zoomKey defined or activated + // Prevent scrolling when zooming (no zoom key, or pressing zoom key) if (!this.options.zoomKey || event[this.options.zoomKey]) return; + // Don't preventDefault if you can't scroll + if (!this.options.verticalScroll && !this.options.horizontalScroll) return; + // Prevent default actions caused by mouse wheel // (else the page and timeline both scroll) event.preventDefault();