From f657435b55bdc7255f2457903fa697eb29b66817 Mon Sep 17 00:00:00 2001
From: Evert Timberg <evert.timberg@gmail.com>
Date: Sun, 12 Jun 2016 13:45:02 -0400
Subject: [PATCH] 0.1.3 release

---
 Chart.Zoom.js     | 65 ++++++++++++++++++++++++++++-------------------
 Chart.Zoom.min.js |  4 +--
 package.json      |  4 +--
 3 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/Chart.Zoom.js b/Chart.Zoom.js
index 6a623939..261d0738 100644
--- a/Chart.Zoom.js
+++ b/Chart.Zoom.js
@@ -1,7 +1,7 @@
 /*!
  * Chart.Zoom.js
  * http://chartjs.org/
- * Version: 0.1.2
+ * Version: 0.1.3
  *
  * Copyright 2016 Evert Timberg
  * Released under the MIT license
@@ -20,14 +20,14 @@ Chart = typeof(Chart) === 'function' ? Chart : window.Chart;
 var helpers = Chart.helpers;
 
 // Take the zoom namespace of Chart
-Chart.Zoom = Chart.Zoom || {};
+var zoomNS = Chart.Zoom = Chart.Zoom || {};
 
 // Where we store functions to handle different scale types
-var zoomFunctions = Chart.Zoom.zoomFunctions = Chart.Zoom.zoomFunctions || {};
-var panFunctions = Chart.Zoom.panFunctions = Chart.Zoom.panFunctions || {}; 
+var zoomFunctions = zoomNS.zoomFunctions = zoomNS.zoomFunctions || {};
+var panFunctions = zoomNS.panFunctions = zoomNS.panFunctions || {}; 
 
 // Default options if none are provided
-var defaultOptions = Chart.Zoom.defaults = {
+var defaultOptions = zoomNS.defaults = {
 	pan: {
 		enabled: true,
 		mode: 'xy',
@@ -93,7 +93,7 @@ function doZoom(chartInstance, zoom, center) {
 		center = {
 			x: (ca.left + ca.right) / 2,
 			y: (ca.top + ca.bottom) / 2,
-		}
+		};
 	}
 
 	var zoomOptions = chartInstance.options.zoom;
@@ -133,16 +133,16 @@ function panTimeScale(scale, delta) {
 }
 
 function panNumericalScale(scale, delta) {
-	var options = scale.options;
+	var tickOpts = scale.options.ticks;
 	var start = scale.start,
 		end = scale.end;
 
-	if (options.ticks.reverse) {
-		options.ticks.max = scale.getValueForPixel(scale.getPixelForValue(start) - delta);
-		options.ticks.min = scale.getValueForPixel(scale.getPixelForValue(end) - delta);
+	if (tickOpts.reverse) {
+		tickOpts.max = scale.getValueForPixel(scale.getPixelForValue(start) - delta);
+		tickOpts.min = scale.getValueForPixel(scale.getPixelForValue(end) - delta);
 	} else {
-		options.ticks.min = scale.getValueForPixel(scale.getPixelForValue(start) - delta);
-		options.ticks.max = scale.getValueForPixel(scale.getPixelForValue(end) - delta);
+		tickOpts.min = scale.getValueForPixel(scale.getPixelForValue(start) - delta);
+		tickOpts.max = scale.getValueForPixel(scale.getPixelForValue(end) - delta);
 	}
 }
 
@@ -176,24 +176,24 @@ function positionInChartArea(chartInstance, position) {
 }
 
 // Store these for later
-Chart.Zoom.zoomFunctions['category'] = zoomIndexScale;
-Chart.Zoom.zoomFunctions['time'] = zoomTimeScale;
-Chart.Zoom.zoomFunctions['linear'] = zoomNumericalScale;
-Chart.Zoom.zoomFunctions['logarithmic'] = zoomNumericalScale;
-Chart.Zoom.panFunctions['category'] = panIndexScale;
-Chart.Zoom.panFunctions['time'] = panTimeScale;
-Chart.Zoom.panFunctions['linear'] = panNumericalScale;
-Chart.Zoom.panFunctions['logarithmic'] = panNumericalScale;
+zoomNS.zoomFunctions.category = zoomIndexScale;
+zoomNS.zoomFunctions.time = zoomTimeScale;
+zoomNS.zoomFunctions.linear = zoomNumericalScale;
+zoomNS.zoomFunctions.logarithmic = zoomNumericalScale;
+zoomNS.panFunctions.category = panIndexScale;
+zoomNS.panFunctions.time = panTimeScale;
+zoomNS.panFunctions.linear = panNumericalScale;
+zoomNS.panFunctions.logarithmic = panNumericalScale;
 
 // Chartjs Zoom Plugin
-var ZoomPlugin = Chart.PluginBase.extend({
+var zoomPlugin = {
 	beforeInit: function(chartInstance) {
 		var node = chartInstance.chart.ctx.canvas;
 		var options = chartInstance.options;
-		var panThreshold = helpers.getValueOrDefault(options.pan ? options.pan.threshold : undefined, Chart.Zoom.defaults.pan.threshold);
+		var panThreshold = helpers.getValueOrDefault(options.pan ? options.pan.threshold : undefined, zoomNS.defaults.pan.threshold);
 
 		var wheelHandler = function(e) {
-			if (e.wheelDelta > 0) {
+			if (e.deltaY < 0) {
 				doZoom(chartInstance, 1.1);
 			} else {
 				doZoom(chartInstance, 0.909);
@@ -201,7 +201,7 @@ var ZoomPlugin = Chart.PluginBase.extend({
 		};
 		chartInstance._wheelHandler = wheelHandler;
 
-		node.addEventListener('mousewheel', wheelHandler);
+		node.addEventListener('wheel', wheelHandler);
 
 		if (Hammer) {
 			var mc = new Hammer.Manager(node);
@@ -255,6 +255,19 @@ var ZoomPlugin = Chart.PluginBase.extend({
 		}
 	},
 
+	beforeDatasetsDraw: function(chartInstance) {
+		var ctx = chartInstance.chart.ctx;
+		var chartArea = chartInstance.chartArea;
+		ctx.save();
+		ctx.beginPath();
+		ctx.rect(chartArea.left, chartArea.top, chartArea.right - chartArea.left, chartArea.bottom - chartArea.top);
+		ctx.clip();
+	},
+
+	afterDatasetsDraw: function(chartInstance) {
+		chartInstance.chart.ctx.restore();
+	},
+
 	destroy: function(chartInstance) {
 		var node = chartInstance.chart.ctx.canvas;
 
@@ -268,8 +281,8 @@ var ZoomPlugin = Chart.PluginBase.extend({
 			mc.remove('panend');
 		}
 	}
-});
+};
 
-Chart.pluginService.register(new ZoomPlugin());
+Chart.pluginService.register(zoomPlugin);
 
 },{"chart.js":1,"hammerjs":1}]},{},[2]);
diff --git a/Chart.Zoom.min.js b/Chart.Zoom.min.js
index af9810f3..5fc472f6 100644
--- a/Chart.Zoom.min.js
+++ b/Chart.Zoom.min.js
@@ -1,10 +1,10 @@
 /*!
  * Chart.Zoom.js
  * http://chartjs.org/
- * Version: 0.1.2
+ * Version: 0.1.3
  *
  * Copyright 2016 Evert Timberg
  * Released under the MIT license
  * https://github.com/chartjs/Chart.Zoom.js/blob/master/LICENSE.md
  */
-!function o(e,n,t){function i(r,l){if(!n[r]){if(!e[r]){var u="function"==typeof require&&require;if(!l&&u)return u(r,!0);if(a)return a(r,!0);var c=new Error("Cannot find module '"+r+"'");throw c.code="MODULE_NOT_FOUND",c}var m=n[r]={exports:{}};e[r][0].call(m.exports,function(o){var n=e[r][1][o];return i(n?n:o)},m,m.exports,o,e,n,t)}return n[r].exports}for(var a="function"==typeof require&&require,r=0;r<t.length;r++)i(t[r]);return i}({1:[function(o,e,n){},{}],2:[function(o,e,n){function t(o,e){return void 0===o?!0:"string"==typeof o?-1!==o.indexOf(e):!1}function i(o,e,n){}function a(o,e,n){var t,i,a,r=o.options;a=o.isHorizontal()?(o.right-o.left)*(e-1):(o.bottom-o.top)*(e-1),t=i=a/2,r.time.min=o.getValueForPixel(o.getPixelForValue(o.firstTick)+t),r.time.max=o.getValueForPixel(o.getPixelForValue(o.lastTick)-i)}function r(o,e,n){var t=(o.max-o.min)*(e-1);o.options.ticks.min=o.min+t/2,o.options.ticks.max=o.max-t/2}function l(o,e,n){var t=h[o.options.type];t&&t(o,e,n)}function u(o,e,n){var i=o.chartArea;n||(n={x:(i.left+i.right)/2,y:(i.top+i.bottom)/2});var a=o.options.zoom;if(a&&x.getValueOrDefault(a.enabled,F.zoom.enabled)){var r=x.getValueOrDefault(o.options.zoom.mode,F.zoom.mode);x.each(o.scales,function(o,i){o.isHorizontal()&&t(r,"x")?l(o,e,n):t(r,"y")&&l(o,e,n)}),o.update(0)}}function c(o,e){}function m(o,e){var n=o.options;n.time.min=o.getValueForPixel(o.getPixelForValue(o.firstTick)-e),n.time.max=o.getValueForPixel(o.getPixelForValue(o.lastTick)-e)}function s(o,e){var n=o.options,t=o.start,i=o.end;n.ticks.reverse?(n.ticks.max=o.getValueForPixel(o.getPixelForValue(t)-e),n.ticks.min=o.getValueForPixel(o.getPixelForValue(i)-e)):(n.ticks.min=o.getValueForPixel(o.getPixelForValue(t)-e),n.ticks.max=o.getValueForPixel(o.getPixelForValue(i)-e))}function f(o,e){var n=g[o.options.type];n&&n(o,e)}function p(o,e,n){var i=o.options.pan;if(i&&x.getValueOrDefault(i.enabled,F.pan.enabled)){var a=x.getValueOrDefault(o.options.pan.mode,F.pan.mode);x.each(o.scales,function(o,i){o.isHorizontal()&&t(a,"x")&&0!==e?f(o,e):t(a,"y")&&0!==n&&f(o,n)}),o.update(0)}}var d=o("hammerjs");d="function"==typeof d?d:window.Hammer;var v=o("chart.js");v="function"==typeof v?v:window.Chart;var x=v.helpers;v.Zoom=v.Zoom||{};var h=v.Zoom.zoomFunctions=v.Zoom.zoomFunctions||{},g=v.Zoom.panFunctions=v.Zoom.panFunctions||{},F=v.Zoom.defaults={pan:{enabled:!0,mode:"xy",threshold:10},zoom:{enabled:!0,mode:"xy"}};v.Zoom.zoomFunctions.category=i,v.Zoom.zoomFunctions.time=a,v.Zoom.zoomFunctions.linear=r,v.Zoom.zoomFunctions.logarithmic=r,v.Zoom.panFunctions.category=c,v.Zoom.panFunctions.time=m,v.Zoom.panFunctions.linear=s,v.Zoom.panFunctions.logarithmic=s;var V=v.PluginBase.extend({beforeInit:function(o){var e=o.chart.ctx.canvas,n=o.options,t=x.getValueOrDefault(n.pan?n.pan.threshold:void 0,v.Zoom.defaults.pan.threshold),i=function(e){e.wheelDelta>0?u(o,1.1):u(o,.909)};if(o._wheelHandler=i,e.addEventListener("mousewheel",i),d){var a=new d.Manager(e);a.add(new d.Pinch),a.add(new d.Pan({threshold:t}));var r,l=function(e){var n=1/r*e.scale;u(o,n,e.center),r=e.scale};a.on("pinchstart",function(o){r=1}),a.on("pinch",l),a.on("pinchend",function(o){l(o),r=null});var c=null,m=null,s=function(e){if(null!==c&&null!==m){var n=e.deltaX-c,t=e.deltaY-m;c=e.deltaX,m=e.deltaY,p(o,n,t)}};a.on("panstart",function(o){c=0,m=0,s(o)}),a.on("panmove",s),a.on("panend",function(o){c=null,m=null}),o._mc=a}},destroy:function(o){var e=(o.chart.ctx.canvas,o._mc);e&&(e.remove("pinchstart"),e.remove("pinch"),e.remove("pinchend"),e.remove("panstart"),e.remove("pan"),e.remove("panend"))}});v.pluginService.register(new V)},{"chart.js":1,hammerjs:1}]},{},[2]);
\ No newline at end of file
+!function e(n,t,o){function a(r,l){if(!t[r]){if(!n[r]){var u="function"==typeof require&&require;if(!l&&u)return u(r,!0);if(i)return i(r,!0);var c=new Error("Cannot find module '"+r+"'");throw c.code="MODULE_NOT_FOUND",c}var s=t[r]={exports:{}};n[r][0].call(s.exports,function(e){var t=n[r][1][e];return a(t?t:e)},s,s.exports,e,n,t,o)}return t[r].exports}for(var i="function"==typeof require&&require,r=0;r<o.length;r++)a(o[r]);return a}({1:[function(e,n,t){},{}],2:[function(e,n,t){function o(e,n){return void 0===e?!0:"string"==typeof e?-1!==e.indexOf(n):!1}function a(e,n,t){}function i(e,n,t){var o,a,i,r=e.options;i=e.isHorizontal()?(e.right-e.left)*(n-1):(e.bottom-e.top)*(n-1),o=a=i/2,r.time.min=e.getValueForPixel(e.getPixelForValue(e.firstTick)+o),r.time.max=e.getValueForPixel(e.getPixelForValue(e.lastTick)-a)}function r(e,n,t){var o=(e.max-e.min)*(n-1);e.options.ticks.min=e.min+o/2,e.options.ticks.max=e.max-o/2}function l(e,n,t){var o=g[e.options.type];o&&o(e,n,t)}function u(e,n,t){var a=e.chartArea;t||(t={x:(a.left+a.right)/2,y:(a.top+a.bottom)/2});var i=e.options.zoom;if(i&&h.getValueOrDefault(i.enabled,V.zoom.enabled)){var r=h.getValueOrDefault(e.options.zoom.mode,V.zoom.mode);h.each(e.scales,function(e,a){e.isHorizontal()&&o(r,"x")?l(e,n,t):o(r,"y")&&l(e,n,t)}),e.update(0)}}function c(e,n){}function s(e,n){var t=e.options;t.time.min=e.getValueForPixel(e.getPixelForValue(e.firstTick)-n),t.time.max=e.getValueForPixel(e.getPixelForValue(e.lastTick)-n)}function f(e,n){var t=e.options.ticks,o=e.start,a=e.end;t.reverse?(t.max=e.getValueForPixel(e.getPixelForValue(o)-n),t.min=e.getValueForPixel(e.getPixelForValue(a)-n)):(t.min=e.getValueForPixel(e.getPixelForValue(o)-n),t.max=e.getValueForPixel(e.getPixelForValue(a)-n))}function m(e,n){var t=F[e.options.type];t&&t(e,n)}function p(e,n,t){var a=e.options.pan;if(a&&h.getValueOrDefault(a.enabled,V.pan.enabled)){var i=h.getValueOrDefault(e.options.pan.mode,V.pan.mode);h.each(e.scales,function(e,a){e.isHorizontal()&&o(i,"x")&&0!==n?m(e,n):o(i,"y")&&0!==t&&m(e,t)}),e.update(0)}}var d=e("hammerjs");d="function"==typeof d?d:window.Hammer;var v=e("chart.js");v="function"==typeof v?v:window.Chart;var h=v.helpers,x=v.Zoom=v.Zoom||{},g=x.zoomFunctions=x.zoomFunctions||{},F=x.panFunctions=x.panFunctions||{},V=x.defaults={pan:{enabled:!0,mode:"xy",threshold:10},zoom:{enabled:!0,mode:"xy"}};x.zoomFunctions.category=a,x.zoomFunctions.time=i,x.zoomFunctions.linear=r,x.zoomFunctions.logarithmic=r,x.panFunctions.category=c,x.panFunctions.time=s,x.panFunctions.linear=f,x.panFunctions.logarithmic=f;var P={beforeInit:function(e){var n=e.chart.ctx.canvas,t=e.options,o=h.getValueOrDefault(t.pan?t.pan.threshold:void 0,x.defaults.pan.threshold),a=function(n){n.deltaY<0?u(e,1.1):u(e,.909)};if(e._wheelHandler=a,n.addEventListener("wheel",a),d){var i=new d.Manager(n);i.add(new d.Pinch),i.add(new d.Pan({threshold:o}));var r,l=function(n){var t=1/r*n.scale;u(e,t,n.center),r=n.scale};i.on("pinchstart",function(e){r=1}),i.on("pinch",l),i.on("pinchend",function(e){l(e),r=null});var c=null,s=null,f=function(n){if(null!==c&&null!==s){var t=n.deltaX-c,o=n.deltaY-s;c=n.deltaX,s=n.deltaY,p(e,t,o)}};i.on("panstart",function(e){c=0,s=0,f(e)}),i.on("panmove",f),i.on("panend",function(e){c=null,s=null}),e._mc=i}},beforeDatasetsDraw:function(e){var n=e.chart.ctx,t=e.chartArea;n.save(),n.beginPath(),n.rect(t.left,t.top,t.right-t.left,t.bottom-t.top),n.clip()},afterDatasetsDraw:function(e){e.chart.ctx.restore()},destroy:function(e){var n=(e.chart.ctx.canvas,e._mc);n&&(n.remove("pinchstart"),n.remove("pinch"),n.remove("pinchend"),n.remove("panstart"),n.remove("pan"),n.remove("panend"))}};v.pluginService.register(P)},{"chart.js":1,hammerjs:1}]},{},[2]);
\ No newline at end of file
diff --git a/package.json b/package.json
index 17f16f7f..269d9e2b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Chart.Zoom.js",
   "description": "Simple HTML5 charts using the canvas element.",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "license": "MIT",
   "main": "src/chart.zoom.js",
   "repository": {
@@ -26,7 +26,7 @@
     "vinyl-source-stream": "^1.1.0"
   },
   "dependencies": {
-    "chart.js": "^2.1.0",
+    "chart.js": "^2.1.5",
     "hammerjs": "^2.0.8"
   }
 }