From 90203ee246fd75b5d2e82dbd1f10db711df3dd7e Mon Sep 17 00:00:00 2001
From: kekee000 <kekee000@gmail.com>
Date: Thu, 24 Oct 2019 18:11:49 +0800
Subject: [PATCH] fix path util

---
 src/editor/Editor.js                       | 29 ++++++++++------------
 src/editor/command/transform.js            |  3 ++-
 src/fonteditor/i18n/en-us/editor.js        |  2 +-
 src/fonteditor/widget/util/glyf2svgfile.js |  2 +-
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/editor/Editor.js b/src/editor/Editor.js
index 47380e0..c231885 100644
--- a/src/editor/Editor.js
+++ b/src/editor/Editor.js
@@ -40,7 +40,7 @@ export default class Editor {
         this.render = render;
 
         // 按顺序执行editor的控制器
-        for (var i = 0, l = this.initers.length; i < l; i++) {
+        for (let i = 0, l = this.initers.length; i < l; i++) {
             this.initers[i].call(this);
         }
 
@@ -54,16 +54,14 @@ export default class Editor {
      * 切换编辑模式
      *
      * @param {string} modeName 模式名称
+     * @param {...Array} args args
      * @return {this}
      */
-    setMode(modeName) {
-
+    setMode(modeName, ...args) {
         if (this.mode) {
             this.mode.end && this.mode.end.call(this);
         }
-
         this.mode = modeSupport[modeName] || modeSupport.default;
-        var args = Array.prototype.slice.call(arguments, 1);
         this.mode.begin && this.mode.begin.apply(this, args);
         return this;
     }
@@ -107,13 +105,13 @@ export default class Editor {
      */
     refreshSelected(shapes) {
         if (this.currentGroup) {
-            var lastShapes = this.currentGroup.shapes;
+            let lastShapes = this.currentGroup.shapes;
             this.currentGroup.setShapes(shapes);
             this.currentGroup.refresh();
 
             if (shapes !== lastShapes) {
                 this.fire('selection:change', {
-                    shapes: shapes
+                    shapes
                 });
             }
         }
@@ -132,14 +130,13 @@ export default class Editor {
      * 执行指定命令
      *
      * @param {...string} command 指令名，后续为命令参数集合
+     * @param {...Array} args args
      * @return {boolean} 是否执行成功
      */
-    execCommand(command) {
-
-        var args = Array.prototype.slice.call(arguments, 1);
-        var event = {
-            command: command,
-            args: args
+    execCommand(command, ...args) {
+        let event = {
+            command,
+            args
         };
         this.fire('beforecommand', event);
 
@@ -148,7 +145,7 @@ export default class Editor {
         }
 
         if (commandSupport[command]) {
-            var ret = commandSupport[command].apply(this, args);
+            let ret = commandSupport[command].apply(this, args);
             event.result = ret;
             this.fire('command', event);
             return ret;
@@ -188,7 +185,7 @@ export default class Editor {
      * @return {boolean}
      */
     isChanged() {
-        var font = this.getFont();
+        let font = this.getFont();
         return this.fontHash !== getFontHash(font);
     }
 
@@ -202,7 +199,7 @@ export default class Editor {
             this.fontHash = 0;
         }
         else {
-            var font = this.getFont();
+            let font = this.getFont();
             this.fontHash = getFontHash(font);
         }
     }
diff --git a/src/editor/command/transform.js b/src/editor/command/transform.js
index f252b0a..ae6f410 100644
--- a/src/editor/command/transform.js
+++ b/src/editor/command/transform.js
@@ -95,6 +95,7 @@ const transform = {
      * @return {boolean} `false`或者`undefined`
      */
     mirrorshapes(shapes) {
+        debugger;
         shapes = shapes || (this.currentGroup && this.currentGroup.shapes);
         if (!shapes || !shapes.length) {
             return false;
@@ -108,4 +109,4 @@ const transform = {
     }
 };
 
-export default transform;
\ No newline at end of file
+export default transform;
diff --git a/src/fonteditor/i18n/en-us/editor.js b/src/fonteditor/i18n/en-us/editor.js
index 7770342..5021fd3 100644
--- a/src/fonteditor/i18n/en-us/editor.js
+++ b/src/fonteditor/i18n/en-us/editor.js
@@ -4,7 +4,7 @@
  */
 
 export default {
-glyph_name: 'Glyph Name',
+    glyph_name: 'Glyph Name',
     left_side_bearing: 'Left Side Bearing',
     right_side_bearing: 'Right Side Bearing',
     baseline_offset: 'Baseline Offset',
diff --git a/src/fonteditor/widget/util/glyf2svgfile.js b/src/fonteditor/widget/util/glyf2svgfile.js
index 0a989b9..c581098 100644
--- a/src/fonteditor/widget/util/glyf2svgfile.js
+++ b/src/fonteditor/widget/util/glyf2svgfile.js
@@ -4,7 +4,7 @@
  */
 
 
-import computeBoundingBox from 'fonteditor-core/graphics/computeBoundingBox';
+import computeBoundingBox from 'graphics/computeBoundingBox';
 import contours2svg from 'fonteditor-core/ttf/util/contours2svg';
 import pathAdjust from 'fonteditor-core/graphics/pathAdjust';
 import pathCeil from 'fonteditor-core/graphics/pathCeil';