Fixed a Javascript error if the user attempts to drag a box annotation

compwright · Nov 18, 2016 · 51b2016 · 51b2016
1 parent 42b3d31
commit 51b2016
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/samples/draggable-line.html b/samples/draggable-line.html
@@ -5,7 +5,7 @@
     <title>Scatter Chart</title>
     <script src="../node_modules/chart.js/dist/Chart.bundle.js"></script>
     <script src="../node_modules/chartjs-plugin-annotation/chartjs-plugin-annotation.min.js"></script>
-    <script src="../dist/chartjs-plugin-draggable.min.js"></script>
+    <script src="../dist/chartjs-plugin-draggable.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -151,6 +151,16 @@
                                 content: "This is a another test label"
                             },
                             draggable: true
+                        },
+                        {
+                            type: 'box',
+                            xScaleID: 'x-axis-1',
+                            yScaleID: 'y-axis-1',
+                            xMin: 25,
+                            xMax: 45,
+                            yMin: 25,
+                            yMax: 45,
+                            borderWidth: 4
                         }]
                     }
                 }

diff --git a/src/accessor.js b/src/accessor.js
@@ -1,5 +1,7 @@
 'use strict';
 
+import { DraggableElement } from './element';
+
 export class DraggableElementAccessor {
 	static isSupported() {
 		return true;
@@ -12,7 +14,7 @@ export class DraggableElementAccessor {
 
 		return elements
 			.map((element, i) => {
-				let className = elementClassFn(configs[i]);
+				let className = elementClassFn(configs[i]) || DraggableElement;
 				return new className(chartInstance, element, configs[i]);
 			})
 			.filter((element, i) => !!configs[i].draggable);

diff --git a/src/annotation/accessor.js b/src/annotation/accessor.js
@@ -37,8 +37,7 @@ export class DraggableAnnotationAccessor extends DraggableElementAccessor {
 					case 'line':
 						return DraggableLineAnnotationElement;
 
-					default:
-						throw `Unsupported annotation type: ${config.type}`;
+					// @TODO: implement 'box' support, DraggableBoxAnnotationElement class
 				}
 			}
 		);