diff --git a/htdocs/samples/zoom_type.html b/htdocs/samples/zoom_type.html
index da532ca..6aa1d9e 100644
--- a/htdocs/samples/zoom_type.html
+++ b/htdocs/samples/zoom_type.html
@@ -22,8 +22,7 @@
},
zoom: {
enabled: true,
- type: 'scroll',
- disableDefaultBehavior: false
+ type: 'scroll'
}
});
@@ -36,8 +35,7 @@
},
zoom: {
enabled: true,
- type: 'drag',
- disableDefaultBehavior: false
+ type: 'drag'
}
});
diff --git a/src/config.js b/src/config.js
index 693cd3e..8ad0f53 100644
--- a/src/config.js
+++ b/src/config.js
@@ -15,7 +15,6 @@ ChartInternal.prototype.getDefaultConfig = function () {
zoom_enabled: false,
zoom_initialRange: undefined,
zoom_type: 'scroll',
- zoom_disableDefaultBehavior: false,
zoom_privileged: false,
zoom_rescale: false,
zoom_onzoom: function () {},
diff --git a/src/zoom.js b/src/zoom.js
index 04c13e3..5fd2c8e 100644
--- a/src/zoom.js
+++ b/src/zoom.js
@@ -62,10 +62,6 @@ ChartInternal.prototype.zoomTransform = function (range) {
};
ChartInternal.prototype.initDragZoom = function () {
- if (!(this.config.zoom_type === 'drag' && this.config.zoom_enabled)) {
- return;
- }
-
const $$ = this;
const d3 = $$.d3;
const config = $$.config;
@@ -73,6 +69,10 @@ ChartInternal.prototype.initDragZoom = function () {
const brushXPos = $$.margin.left + 20.5;
const brushYPos = $$.margin.top + 0.5;
+ if (!(config.zoom_type === 'drag' && config.zoom_enabled)) {
+ return;
+ }
+
const brush = $$.dragZoomBrush = d3.brushX()
.on("start", () => {
$$.api.unzoom();
@@ -88,16 +88,12 @@ ChartInternal.prototype.initDragZoom = function () {
})
.on("end", () => {
if (d3.event.selection == null) {
- return
+ return;
}
const [x0, x1] = d3.event.selection;
- if (!config.zoom_disableDefaultBehavior) {
- $$.api.zoom([$$.x.invert(x0), $$.x.invert(x1)]);
- } else {
- $$.api.zoom([$$.x.invert(x0), $$.x.invert(x1)]);
- }
+ $$.api.zoom([$$.x.invert(x0), $$.x.invert(x1)]);
$$.svg
.select("." + CLASS.dragZoom)