fix command menu visible

src/fonteditor/controller/default.js

@@ -47,8 +47,9 @@ define(
                     if (ttf) {
                         $('.main').addClass('editing');
                         $('.editor').addClass('editing');
+                        
+                        program.viewer.setMode('editor');
 
-                        program.viewerCommandMenu.hide();
                         program.viewer.blur();
                         program.editor.show();
 
@@ -75,7 +76,8 @@ define(
 
                     program.data.editingIndex = -1;
                     program.editor && program.editor.hide();
-                    program.viewerCommandMenu.show();
+
+                    program.viewer.setMode('list');
                     program.viewer.focus();
                 };
 
@@ -125,7 +127,6 @@ define(
                         }
                         program.ttfManager.set(imported);
                         program.data.projectName = e.projectName;
-                        program.viewerCommandMenu.show();
                         program.viewer.focus();
                     }
                 }).on('del', function(e) {
@@ -136,6 +137,7 @@ define(
                 });
 
                 program.ttfManager.on('change', function(e) {
+                    // 保存正在编辑的字形
                     if (program.editor.isEditing() && program.data.editingIndex !== -1) {
                         program.viewer.refresh(e.ttf, [program.data.editingIndex]);
                     }
@@ -143,6 +145,15 @@ define(
                         program.viewer.show(e.ttf, program.viewer.getSelected());
                         program.viewer.focus();
                     }
+                }).on('set', function(e) {
+
+                    // 未初始化状态，命令栏是不显示的，需要设置下编辑模式
+                    if (!program.viewer.inited) {
+                        program.viewer.setMode('list');
+                        program.viewer.inited = true;
+                    }
+                    program.viewer.show(e.ttf, program.viewer.getSelected());
+                    program.viewer.focus();
                 });
 
 

src/fonteditor/main.js

@@ -26,7 +26,6 @@ define(
                     type: file.name.slice(file.name.lastIndexOf('.') + 1).toLowerCase(),
                     success: function(imported) {
                         program.viewer.clearSelected();
-                        program.viewerCommandMenu.show();
                         program.ttfManager.set(imported);
                         program.data.projectName = null;
                     }

src/fonteditor/widget/actions.js

@@ -61,7 +61,6 @@ define(
                 }
                 
                 $.getJSON('./font/empty.json', function(imported) {
-                    program.viewerCommandMenu.show();
                     program.ttfManager.set(imported);
                     program.data.projectName = null;
                 });

src/fonteditor/widget/glyfviewer.js

@@ -319,6 +319,7 @@ define(
         function GLYFViewer(main, options) {
             this.options = options || {};
             this.main = $(main);
+            this.mode = 'list';
 
             bindEvents.call(this);
 
@@ -412,6 +413,17 @@ define(
             this.main.children().removeClass('selected');
         };
 
+        /**
+         * 设置编辑模式
+         * @param {string} mode 编辑模式
+         */
+        GLYFViewer.prototype.setMode = function(mode) {
+            this.mode = mode || 'list';
+            if (this.options.commandMenu) {
+                this.options.commandMenu[this.mode === 'list' ? 'show' : 'hide']();
+            }
+        };
+
         /**
          * 设置选中的列表
          */

src/fonteditor/widget/ttfmanager.js

@@ -70,7 +70,8 @@ define(
                 this.history.add(lang.clone(this.ttf.getGlyf()));
 
                 this.changed = false;
-                this.fire('change', {
+
+                this.fire('set', {
                     ttf: this.ttf.get()
                 });
             }