Fix handler behavior. Fix type in code docs.

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 An in-progress version being developed on the `master` branch.
 
+## 0.20.10 - Jan 26th, 2018
+### Changed
+- No longer throw an exception when enabling an enabled handler, or disabling disabled handler.
+- Add package-lock.jon file to repo.
+
 ## 0.20.9 - Jan 16th, 2018
 ### Changed
 - Bump dependency versions.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lumo",
-  "version": "0.20.9",
+  "version": "0.20.10",
   "description": "A high performance WebGL tile rendering library",
   "main": "src/exports.js",
   "author": "Kevin Birk <[email protected]>",
@@ -30,11 +30,11 @@
     "del": "3.0.0",
     "eslint-plugin-jsdoc": "3.3.1",
     "gulp": "3.9.1",
-    "gulp-eslint": "4.0.1",
+    "gulp-eslint": "4.0.2",
     "gulp-istanbul": "1.1.3",
     "gulp-mocha": "3.0.1",
     "gulp-uglify": "3.0.0",
-    "sinon": "4.1.6",
+    "sinon": "4.2.1",
     "vinyl-buffer": "1.0.1",
     "vinyl-source-stream": "2.0.0"
   },

src/plot/handler/ClickHandler.js

@@ -45,7 +45,9 @@ class ClickHandler extends DOMHandler {
 	 * @returns {ClickHandler} The handler object, for chaining.
 	 */
 	enable() {
-		super.enable();
+		if (this.enabled) {
+			return this;
+		}
 
 		const plot = this.plot;
 
@@ -83,6 +85,7 @@ class ClickHandler extends DOMHandler {
 		container.addEventListener('mousedown', this.mousedown);
 		container.addEventListener('mouseup', this.mouseup);
 		container.addEventListener('dblclick', this.dblclick);
+		return super.enable();
 	}
 
 	/**
@@ -91,14 +94,18 @@ class ClickHandler extends DOMHandler {
 	 * @returns {ClickHandler} The handler object, for chaining.
 	 */
 	disable() {
-		super.disable();
+		if (!this.enabled) {
+			return this;
+		}
+
 		const container = this.plot.getContainer();
 		container.removeEventListener('mousedown', this.mousedown);
 		container.removeEventListener('mouseup', this.mouseup);
 		container.removeEventListener('dblclick', this.dblclick);
 		this.mousedown = null;
 		this.mouseup = null;
 		this.dblclick = null;
+		return super.disable();
 	}
 }
 

src/plot/handler/DOMHandler.js

@@ -19,25 +19,21 @@ class DOMHandler {
 	/**
 	 * Enables the handler.
 	 *
-	 * @returns {ZoomHandler} The handler object, for chaining.
+	 * @returns {DOMHandler} The handler object, for chaining.
 	 */
 	enable() {
-		if (this.enabled) {
-			throw 'Handler is already enabled';
-		}
 		this.enabled = true;
+		return this;
 	}
 
 	/**
 	 * Disables the handler.
 	 *
-	 * @returns {ZoomHandler} The handler object, for chaining.
+	 * @returns {DOMHandler} The handler object, for chaining.
 	 */
 	disable() {
-		if (!this.enabled) {
-			throw 'Handler is already disabled';
-		}
 		this.enabled = false;
+		return this;
 	}
 
 	/**

src/plot/handler/MouseHandler.js

@@ -35,7 +35,9 @@ class MouseHandler extends DOMHandler {
 	 * @returns {MouseHandler} The handler object, for chaining.
 	 */
 	enable() {
-		super.enable();
+		if (this.enabled) {
+			return this;
+		}
 
 		const plot = this.plot;
 
@@ -81,6 +83,7 @@ class MouseHandler extends DOMHandler {
 		container.addEventListener('mouseover', this.mouseover);
 		container.addEventListener('mouseout', this.mouseout);
 		container.addEventListener('wheel', this.wheel);
+		return super.enable();
 	}
 
 	/**
@@ -89,7 +92,9 @@ class MouseHandler extends DOMHandler {
 	 * @returns {MouseHandler} The handler object, for chaining.
 	 */
 	disable() {
-		super.disable();
+		if (!this.enabled) {
+			return this;
+		}
 
 		const container = this.plot.getContainer();
 		container.removeEventListener('mousedown', this.mousedown);
@@ -104,6 +109,7 @@ class MouseHandler extends DOMHandler {
 		this.mouseover = null;
 		this.mouseout = null;
 		this.wheel = null;
+		return super.disable();
 	}
 }
 

src/plot/handler/PanHandler.js

@@ -86,7 +86,9 @@ class PanHandler extends DOMHandler {
 	 * @returns {PanHandler} The handler object, for chaining.
 	 */
 	enable() {
-		super.enable();
+		if (this.enabled) {
+			return this;
+		}
 
 		const plot = this.plot;
 
@@ -232,6 +234,7 @@ class PanHandler extends DOMHandler {
 		container.addEventListener('mousedown', this.mousedown);
 		document.addEventListener('mousemove', this.mousemove);
 		document.addEventListener('mouseup', this.mouseup);
+		return super.enable();
 	}
 
 	/**
@@ -240,7 +243,9 @@ class PanHandler extends DOMHandler {
 	 * @returns {PanHandler} The handler object, for chaining.
 	 */
 	disable() {
-		super.disable();
+		if (!this.enabled) {
+			return this;
+		}
 
 		const container = this.plot.getContainer();
 		container.removeEventListener('mousedown', this.mousedown);
@@ -249,6 +254,7 @@ class PanHandler extends DOMHandler {
 		this.mousedown = null;
 		this.mousemove = null;
 		this.mouseup = null;
+		return super.disable();
 	}
 
 	/**

src/plot/handler/ZoomHandler.js

@@ -228,7 +228,9 @@ class ZoomHandler extends DOMHandler {
 	 * @returns {ZoomHandler} The handler object, for chaining.
 	 */
 	enable() {
-		super.enable();
+		if (this.enabled) {
+			return this;
+		}
 
 		const plot = this.plot;
 
@@ -290,6 +292,7 @@ class ZoomHandler extends DOMHandler {
 		const container = plot.getContainer();
 		container.addEventListener('dblclick', this.dblclick);
 		container.addEventListener('wheel', this.wheel);
+		return super.enable();
 	}
 
 	/**
@@ -298,13 +301,16 @@ class ZoomHandler extends DOMHandler {
 	 * @returns {ZoomHandler} The handler object, for chaining.
 	 */
 	disable() {
-		super.disable();
+		if (!this.enabled) {
+			return this;
+		}
 
 		const container = this.plot.getContainer();
 		container.removeEventListener('dblclick', this.dblclick);
 		container.removeEventListener('wheel', this.wheel);
 		this.dblclick = null;
 		this.wheel = null;
+		return super.disable();
 	}
 
 	/**