fixes #406 (#408)

stockiNail · web-flow · commit afe08f18b510 · 2020-12-05T09:44:51.000-08:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # chartjs-plugin-zoom
 
-A zoom and pan plugin for Chart.js >= 3.0.0.
+A zoom and pan plugin for Chart.js >= 3.0.0-beta7.
 
 For Chart.js 2.6.0 to 2.9.x support, use [version 0.7.7 of this plugin](https://github.com/chartjs/chartjs-plugin-zoom/releases/tag/v0.7.7).
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "test": "gulp test"
   },
   "devDependencies": {
-    "chart.js": "^3.0.0-beta.6",
+    "chart.js": "^3.0.0-beta.7",
     "coveralls": "^3.1.0",
     "eslint": "^5.12.1",
     "eslint-config-chartjs": "^0.1.0",
@@ -49,7 +49,7 @@
     "yargs": "^15.3.1"
   },
   "peerDependencies": {
-    "chart.js": "^3.0.0-beta.6"
+    "chart.js": "^3.0.0-beta.7"
   },
   "dependencies": {
     "hammerjs": "^2.0.8"
diff --git a/samples/pan-bar.html b/samples/pan-bar.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Bar Chart Pan</title>
-	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.6"></script>
+	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.7"></script>
 	<script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
 	<script src="../dist/chartjs-plugin-zoom.min.js"></script>
 
diff --git a/samples/zoom-bar-x.html b/samples/zoom-bar-x.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Bar Chart Zoom</title>
-	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.6"></script>
+	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.7"></script>
 	<script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
 	<script src="../dist/chartjs-plugin-zoom.min.js"></script>
 
diff --git a/samples/zoom-bar.html b/samples/zoom-bar.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Bar Chart Zoom</title>
-	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.6"></script>
+	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.7"></script>
 	<script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
 	<script src="../dist/chartjs-plugin-zoom.min.js"></script>
 
diff --git a/samples/zoom-horizontal-bar.html b/samples/zoom-horizontal-bar.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Horizontal Bar Chart Zoom</title>
-	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.6"></script>
+	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.7"></script>
 	<script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
 	<script src="../dist/chartjs-plugin-zoom.min.js"></script>
 
diff --git a/samples/zoom-log.html b/samples/zoom-log.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Scatter Chart</title>
-	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.6"></script>
+	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.7"></script>
 	<script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
 	<script src="../dist/chartjs-plugin-zoom.min.js"></script>
 
diff --git a/samples/zoom-time.html b/samples/zoom-time.html
@@ -4,7 +4,7 @@
 <head>
 	<title>Line Chart</title>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.6"></script>
+	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.7"></script>
 	<script src="https://cdn.jsdelivr.net/npm/chartjs-adapter-moment@0.1.2"></script>
 	<script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
 	<script src="../dist/chartjs-plugin-zoom.js"></script>
diff --git a/samples/zoom.html b/samples/zoom.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Scatter Chart</title>
-	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.6"></script>
+	<script src="https://cdn.jsdelivr.net/npm/chart.js@3.0.0-beta.7"></script>
 	<script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
 	<script src="../dist/chartjs-plugin-zoom.min.js"></script>
 
diff --git a/src/plugin.js b/src/plugin.js
@@ -388,7 +388,7 @@ var zoomPlugin = {
 		resolveOptions(chart, options);
 	},
 
-	beforeInit: function(chartInstance, pluginOptions) {
+	beforeInit: function(chartInstance, args, pluginOptions) {
 		chartInstance.$zoom = {
 			_originalOptions: {}
 		};
diff --git a/test/specs/defaults.spec.js b/test/specs/defaults.spec.js
@@ -33,6 +33,6 @@ describe('defaults', function() {
 			}
 		});
 
-		expect(spy).toHaveBeenCalledWith(chart, {mode: undefined}, expected);
+		expect(spy).toHaveBeenCalledWith(chart, {cancelable: true, mode: undefined}, expected);
 	});
 });

-Original file line number
+Diff line change
 <head>
 	<title>Bar Chart Pan</title>
 -	<script src="https://cdn.jsdelivr.net/npm/[email protected].6"></script>
 +	<script src="https://cdn.jsdelivr.net/npm/[email protected].7"></script>
 	<script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
 	<script src="../dist/chartjs-plugin-zoom.min.js"></script>