From 783e4952b4caf844cd303d597149d909274c1014 Mon Sep 17 00:00:00 2001
From: TevinLi <6317595@qq.com>
Date: Tue, 29 Nov 2016 22:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E2=80=9C=E5=85=B3=E4=BA=8EamWiki=E2=80=9D=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/catalogue.js |  2 +-
 lib/main.js      | 15 +++++++++++++++
 menus/awiki.cson | 13 +++++++++----
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/lib/catalogue.js b/lib/catalogue.js
index b3eacf7..698fe9c 100644
--- a/lib/catalogue.js
+++ b/lib/catalogue.js
@@ -36,7 +36,7 @@ module.exports = {
                 .replace(/\[(.*?)]\(.*?\)/g, '$1')  //去除链接
                 .replace(/<.*?>/g, '')  //去除html标签
                 .replace(/'/g, '&#39;')  //转义单引号
-                .replace(/"/g, '&#34;')  //转义双引号，由于双引号无法正确传给html属性，当作为hash时删除
+                .replace(/"/g, '&#34;')  //转义双引号，由于双引号无法正确传递给html属性，当作为hash时将删除处理
                 .replace(/\(/g, '&#40;')  //转义左圆括号
                 .replace(/\)/g, '&#41;')  //转义右圆括号
                 .replace(/\[/g, '&#91;')  //转义左中括号
diff --git a/lib/main.js b/lib/main.js
index d1096ff..1645d03 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -60,6 +60,10 @@ module.exports = {
             //命令，浏览打开当前页面
             'amWiki:browser': function () {
                 webServer.browser(that.state.libraryList);
+            },
+            //命令，显示about
+            'amWiki:about': function () {
+                that.showAbout();
             }
         }));
         //自动化模块启动
@@ -81,5 +85,16 @@ module.exports = {
             libraryList: this.state.libraryList,
             libraryMD5: this.state.libraryMD5
         };
+    },
+    //显示相关
+    showAbout: function () {
+        atom.packages.activatePackage('amWiki').then(function (pkg) {
+            var content = 'amWiki v' + pkg.metadata.version + '\n' +
+                'https://github.com/TevinLi/amWiki\n' +
+                'MIT Copyright(c) 2016-2099 Tevin Li\n';
+            alert(content);
+            //TODO: 升级关于弹窗
+            //var c = atom.workspace.addModalPanel({item: document.createElement('div'), className: 'amWiki-about'})
+        });
     }
 };
\ No newline at end of file
diff --git a/menus/awiki.cson b/menus/awiki.cson
index f61f09a..1858515 100644
--- a/menus/awiki.cson
+++ b/menus/awiki.cson
@@ -1,21 +1,26 @@
 'menu': [{
     'label': 'amWiki轻文库',
     'submenu': [{
-        'label': '通过 “config.json” 创建新文库',
+        'label': '通过 "config.json" 创建新文库',
         'command': 'amWiki:create'
     }, {
         'label': '手动更新当前文库导航文件',
         'command': 'amWiki:makeNav'
     }, {
-        'label': '提取h2、h3标题为页内目录',
+        'label': '提取 h2,h3 标题为页内目录',
         'command': 'amWiki:catalogue'
     }, {
         'type': 'separator'
     }, {
-        'label': '启动本地静态web服务器',
+        'label': '启动本地静态 Web 服务器',
         'command': 'amWiki:runServer'
     }, {
         'label': '在浏览器打开当前文档',
         'command': 'amWiki:browser'
-    }]
+    }, {
+         'type': 'separator'
+     }, {
+         'label': '关于 amWiki',
+         'command': 'amWiki:about'
+     }]
 }]
\ No newline at end of file