修复未绘制图形时添加手势造成的脚本错误

Ref:#17
ElemeFE · Oct 31, 2016 · 6cc0958 · 6cc0958
1 parent 873e563
commit 6cc0958
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/demo/index.js b/demo/index.js
@@ -7,7 +7,7 @@ let lastPoints = [];
 const options = {
   el: document.getElementById('test'),
   enablePath: true,
-  timeDelay: 500,
+  timeDelay: 100,
   triggerMouseKey: 'left',
   onSwipe: (list) => {
     document.getElementById('result0').innerHTML = list.join('');

diff --git a/src/dollarOne/helper.js b/src/dollarOne/helper.js
@@ -34,12 +34,13 @@ const pathLength = (points) => {
 const centroid = (points) => {
   let x = 0.0;
   let y = 0.0;
-  for (let i = 0; i < points.length; i++) {
+  let len = points.length;
+  for (let i = 0; i < len; i++) {
     x += points[i].x;
     y += points[i].y;
   }
-  x /= points.length;
-  y /= points.length;
+  x /= len;
+  y /= len;
   return new Point(x, y);
 };
 

diff --git a/src/index.js b/src/index.js
@@ -207,8 +207,19 @@ class Canvas {
 
   addGesture(ges = {}) {
     const { name, points } = ges;
-    if (!name || !points || !Array.isArray(points)) {
-      console.warn('invalid params. addGesture fail.');
+    const safeName = name.trim();
+    const msgMap = {
+      'EMPTY_NAME':'Invalid Gesture Name. `addGesture` failed.',
+      'EMPTY_POINT':'Invalid Points. `addGesture` failed.'
+    };
+
+    if(!safeName){
+      console.warn(msgMap['EMPTY_NAME']);
+      return false;
+    }
+
+    if (!points || !Array.isArray(points) || !points.length) {
+      console.warn(msgMap['EMPTY_POINT']);
       return false;
     }